[Piglit] [PATCH] cubemap-getteximage-pbo: Silence NUMCOLORS redefined warning on MinGW.

Vinson Lee vlee at freedesktop.org
Fri Jan 17 14:49:39 PST 2014


cubemap-getteximage-pbo.c:41:0: warning: "NUMCOLORS" redefined [enabled by default]
 #define NUMCOLORS        7
 ^
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/windows.h:71:0,
                 from piglit/tests/util/piglit-util.h:35,
                 from piglit/tests/util/piglit-util-gl-common.h:32,
                 from piglit/tests/texturing/cubemap-getteximage-pbo.c:33:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/wingdi.h:1521:0: note: this is the location of the previous definition
 #define NUMCOLORS 24
 ^

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
 tests/texturing/cubemap-getteximage-pbo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/texturing/cubemap-getteximage-pbo.c b/tests/texturing/cubemap-getteximage-pbo.c
index 85e8c52..d62eac1 100644
--- a/tests/texturing/cubemap-getteximage-pbo.c
+++ b/tests/texturing/cubemap-getteximage-pbo.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 PIGLIT_GL_TEST_CONFIG_END
 
 
+#undef NUMCOLORS
 #define NUMCOLORS        7
 #define TEX_WIDTH        32
 #define TEX_HEIGHT       32
-- 
1.8.4.2



More information about the Piglit mailing list