Mesa (mesa_7_7_branch): progs/tests: Silence 'missing initializer' warnings .

Vinson Lee vlee at kemper.freedesktop.org
Sat Jan 9 07:10:09 UTC 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: 683e3cb8db5a57db2ebd364986a399e2b1009e00
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=683e3cb8db5a57db2ebd364986a399e2b1009e00

Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Jan  8 23:08:57 2010 -0800

progs/tests: Silence 'missing initializer' warnings.

---

 progs/tests/interleave.c |    2 +-
 progs/tests/texwrap.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/progs/tests/interleave.c b/progs/tests/interleave.c
index 47bf9df..acf67d0 100644
--- a/progs/tests/interleave.c
+++ b/progs/tests/interleave.c
@@ -105,7 +105,7 @@ static const unsigned indicies[12] = {
    1, 4, 2
 };
 
-#define NONE  { NULL, 0, 0, 0 }
+#define NONE  { NULL, 0, 0, 0, sizeof( NULL ) }
 #define V2F   { v,    2, 2 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
 #define V3F   { v,    3, 3 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
 #define V4F   { v,    4, 4 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
diff --git a/progs/tests/texwrap.c b/progs/tests/texwrap.c
index 92c8a2f..39c5591 100644
--- a/progs/tests/texwrap.c
+++ b/progs/tests/texwrap.c
@@ -71,7 +71,7 @@ static struct wrap_mode modes[] = {
    WRAP_EXT ( GL_MIRROR_CLAMP_TO_EDGE_EXT, "GL_ATI_texture_mirror_once",
 	                                   "GL_EXT_texture_mirror_clamp",
 	      999.0 ),
-   { 0 }
+   { 0, NULL, GL_FALSE, 0.0, { NULL, NULL } }
 };
 
 static void




More information about the mesa-commit mailing list