summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-03-14 13:41:16 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-03-14 14:46:13 +0000
commitf13772134a2666398a77cc9707bb2a72a85ae1b6 (patch)
treeebd0c9cb14236ffe8d626047323ecd28b0c961e8
parent8e921b623e060b1f6ea1169c6234c267300dd666 (diff)
s/WIN32/_WIN32/
The proper macro for Windows operating systems is _WIN32 and not WIN32. Thanks to Vinson Lee to remind me of that.
-rw-r--r--src/piglit/gl_wrap.h2
-rw-r--r--src/piglit/glut_wrap.h2
-rw-r--r--tests/general/fog-modes.c2
-rw-r--r--tests/shaders/glsl-fs-pointcoord.c2
-rw-r--r--tests/shaders/shader_runner.c4
-rw-r--r--tests/spec/ext_fog_coord/modes.c2
-rw-r--r--tests/util/glew.c2
-rw-r--r--tests/util/piglit-util-gl.c2
-rw-r--r--tests/util/piglit-util-gles2.c2
-rw-r--r--tests/util/piglit-util.c2
-rw-r--r--tests/util/piglit-util.h2
11 files changed, 12 insertions, 12 deletions
diff --git a/src/piglit/gl_wrap.h b/src/piglit/gl_wrap.h
index 872f768b6..eb3de29d9 100644
--- a/src/piglit/gl_wrap.h
+++ b/src/piglit/gl_wrap.h
@@ -38,7 +38,7 @@
extern "C" {
#endif
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#endif
diff --git a/src/piglit/glut_wrap.h b/src/piglit/glut_wrap.h
index 245b6d055..c2ff532a5 100644
--- a/src/piglit/glut_wrap.h
+++ b/src/piglit/glut_wrap.h
@@ -38,7 +38,7 @@
extern "C" {
#endif
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#endif
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index e0a85ff0a..4e263fb6e 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -29,7 +29,7 @@
#include "piglit-util.h"
#include "piglit-framework.h"
-#if defined(WIN32)
+#if defined(_WIN32)
#undef near
#undef far
#endif
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index 439c17b9d..2e3f24cc7 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -31,7 +31,7 @@
* with point sprites enabled.
*/
-#if defined(WIN32)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 9e4a5ccc7..8ee2804a7 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -31,7 +31,7 @@
#endif
#include <string.h>
#include <ctype.h>
-#if defined(WIN32)
+#if defined(_WIN32)
#include <stdlib.h>
#else
#include <libgen.h>
@@ -904,7 +904,7 @@ piglit_init(int argc, char **argv)
if (argc > 2) {
path = argv[2];
} else {
-#if defined(WIN32)
+#if defined(_WIN32)
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c
index 0c4daf688..43d98dff8 100644
--- a/tests/spec/ext_fog_coord/modes.c
+++ b/tests/spec/ext_fog_coord/modes.c
@@ -29,7 +29,7 @@
#include "piglit-util.h"
#include "piglit-framework.h"
-#if defined(WIN32)
+#if defined(_WIN32)
#undef near
#undef far
#endif
diff --git a/tests/util/glew.c b/tests/util/glew.c
index ef149caa5..56a0ef882 100644
--- a/tests/util/glew.c
+++ b/tests/util/glew.c
@@ -2365,7 +2365,7 @@ PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL;
PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL;
-#endif /* !WIN32 || !GLEW_MX */
+#endif /* !_WIN32 || !GLEW_MX */
#if !defined(GLEW_MX)
diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 7d7d50d00..2be0d0d73 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -21,7 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#if defined(WIN32)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/tests/util/piglit-util-gles2.c b/tests/util/piglit-util-gles2.c
index 4553233f2..2e3af6943 100644
--- a/tests/util/piglit-util-gles2.c
+++ b/tests/util/piglit-util-gles2.c
@@ -21,7 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#if defined(WIN32)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/tests/util/piglit-util.c b/tests/util/piglit-util.c
index d46994acf..0f58de14e 100644
--- a/tests/util/piglit-util.c
+++ b/tests/util/piglit-util.c
@@ -21,7 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#if defined(WIN32)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
index a73f4530c..e1c781ebf 100644
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -25,7 +25,7 @@
#include "config.h"
-#if defined(WIN32)
+#if defined(_WIN32)
#include <windows.h>
#endif