mesa-main-0-NULL.patch from Jeff Muizelaar

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 12ea41379ccd7bd3a93adc432d3ec0879ffddb85..cb827c2ec9c8ee7d03914b27790f503748c88c3c 100644 (file)
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -229,32 +229,32 @@ static void GLAPIENTRY Vertex4dv(const GLdouble *v)
 
 static const array_func VertexFuncs[3][8] = {
    {
-      0,
-      0,
+      NULL,
+      NULL,
       (array_func) Vertex2sv,
-      0,
+      NULL,
       (array_func) Vertex2iv,
-      0,
+      NULL,
       (array_func) Vertex2fv,
       (array_func) Vertex2dv,
    },
    {
-      0,
-      0,
+      NULL,
+      NULL,
       (array_func) Vertex3sv,
-      0,
+      NULL,
       (array_func) Vertex3iv,
-      0,
+      NULL,
       (array_func) Vertex3fv,
       (array_func) Vertex3dv,
    },
    {
-      0,
-      0,
+      NULL,
+      NULL,
       (array_func) Vertex4sv,
-      0,
+      NULL,
       (array_func) Vertex4iv,
-      0,
+      NULL,
       (array_func) Vertex4fv,
       (array_func) Vertex4dv,
    },
@@ -286,12 +286,12 @@ static void GLAPIENTRY Indexdv(const GLdouble *c)
 }
 
 static const array_func IndexFuncs[8] = {
-   0,
+   NULL,
    (array_func) Indexubv,
    (array_func) Indexsv,
-   0,
+   NULL,
    (array_func) Indexiv,
-   0,
+   NULL,
    (array_func) Indexfv,
    (array_func) Indexdv,
 };
@@ -323,11 +323,11 @@ static void GLAPIENTRY Normal3dv(const GLdouble *v)
 
 static const array_func NormalFuncs[8] = {
    (array_func) Normal3bv,
-   0,
+   NULL,
    (array_func) Normal3sv,
-   0,
+   NULL,
    (array_func) Normal3iv,
-   0,
+   NULL,
    (array_func) Normal3fv,
    (array_func) Normal3dv,
 };
@@ -397,12 +397,12 @@ static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f)
 }
 
 static const array_func FogCoordFuncs[8] = {
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
    (array_func) FogCoordfvEXT,
    (array_func) FogCoorddvEXT
 };
@@ -866,7 +866,7 @@ void _ae_destroy_context( GLcontext *ctx )
 {
    if ( AE_CONTEXT( ctx ) ) {
       FREE( ctx->aelt_context );
-      ctx->aelt_context = 0;
+      ctx->aelt_context = NULL;
    }
 }
 

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 9d2fc95be31dc24b5459d07c14834103d168ab6f..3ca08859a7418ef2db2cdad66c18ad394b07055c 100644 (file)
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -474,7 +474,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *oldBufObj;
-   struct gl_buffer_object *newBufObj = 0;
+   struct gl_buffer_object *newBufObj = NULL;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" );

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f95e8db98cb6491b995a5f71ad8cf8f1dcdc9f39..effdb7702a7de5faa8727f0983cc09681e92742d 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5169,7 +5169,7 @@ static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat
    }
 
    {
-      GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, 0 );
+      GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, NULL );
       for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
         if (bitmask & (1<<i)) {
            ctx->ListState.ActiveMaterialSize[i] = args;

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 8f61187a3daff0352e91bf4608177c134bd6190d..946b5b96a45a7931228fb45cb6513d0a61ede710 100644 (file)
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -964,8 +964,8 @@ static enum_elt all_enums[] =
 
 typedef int (*cfunc)(const void *, const void *);
 
-static enum_elt **index1 = 0;
-static int sorted = 0;
+static enum_elt **index1;
+static int sorted;
 
 static int compar_name( const enum_elt *a, const enum_elt *b )
 {

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 38b13e90f3baeabaaf80620573542364b6d65660..5188a79c95137d28571a9f8b47bc2c2359170f78 100644 (file)
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -56,7 +56,7 @@ _mesa_GetString( GLenum name )
    static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
    static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/
 
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    /* this is a required driver function */
    assert(ctx->Driver.GetString);

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 0cf2635765f112f9639b5d2384f726dccc1b039d..4c39d2ff4c97befd75b5670857ebc28a411f6667 100644 (file)
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -876,7 +876,7 @@ _mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
    ASSERT(side < 2);
    if (ctx->_ShineTable[side])
       ctx->_ShineTable[side]->refcount--;
-   ctx->_ShineTable[side] = 0;
+   ctx->_ShineTable[side] = NULL;
 }
 
 
@@ -1281,7 +1281,8 @@ _mesa_init_lighting( GLcontext *ctx )
    ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;
    ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx,
                                                GL_FRONT_AND_BACK,
-                                               GL_AMBIENT_AND_DIFFUSE, ~0, 0 );
+                                               GL_AMBIENT_AND_DIFFUSE, ~0,
+                                               NULL );
 
    ctx->Light.ColorMaterialEnabled = GL_FALSE;
 

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 396f14a5663945af7168c81267ebd4318a19ef20..d18b1d0b418fc6afba44813eb3c6a7c5e2c18538 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -247,7 +247,7 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
       addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
       break;
    default:
-      return 0;
+      return NULL;
    }
 
    return addr;

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 1691ae1387944c34340df2de451e47a465dbe02b..e6e39d4b434754f846e53205dc2baa45ed482c53 100644 (file)
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -700,7 +700,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    GLuint unit = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    struct gl_texture_object *oldTexObj;
-   struct gl_texture_object *newTexObj = 0;
+   struct gl_texture_object *newTexObj = NULL;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))