Use the correct macro _WIN32 for Windows.

The correct predefined macro for Windows is _WIN32, not WIN32 or
__WIN32__.  _WIN32 is defined for 32-bit and 64-bit version of Windows
by both MSVC and MinGW compilers.

http://sourceforge.net/p/predef/wiki/OperatingSystems
http://msdn.microsoft.com/en-us/library/b0084kay.aspx

This patch also fixes a MinGW automake build error.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/auxiliary/util/u_snprintf.c b/src/gallium/auxiliary/util/u_snprintf.c
index f0d53b3cecd5c1364f2d4751f7ee87f757050e20..e16f103e3f50f0f78e33bdafc92b8a254a03511c 100644 (file)
--- a/src/gallium/auxiliary/util/u_snprintf.c
+++ b/src/gallium/auxiliary/util/u_snprintf.c
@@ -167,7 +167,7 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #else
-#ifdef WIN32
+#ifdef _WIN32
 #define vsnprintf util_vsnprintf
 #define snprintf util_snprintf
 #define HAVE_VSNPRINTF 0

diff --git a/src/gallium/auxiliary/util/u_string.h b/src/gallium/auxiliary/util/u_string.h
index ed15981f1a5b61afe62532bda3a9c27460e3bbbc..15630ad0791bf0947903267e9639bebe08bad96d 100644 (file)
--- a/src/gallium/auxiliary/util/u_string.h
+++ b/src/gallium/auxiliary/util/u_string.h
@@ -35,7 +35,7 @@
 #ifndef U_STRING_H_
 #define U_STRING_H_
 
-#if !defined(WIN32) && !defined(XF86_LIBC_H)
+#if !defined(_WIN32) && !defined(XF86_LIBC_H)
 #include <stdio.h>
 #endif
 #include <stddef.h>
@@ -64,7 +64,7 @@ util_strchrnul(const char *s, char c)
 
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 
 int util_vsnprintf(char *, size_t, const char *, va_list);
 int util_snprintf(char *str, size_t size, const char *format, ...);

diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index 1c0d514667a35eca11f681b1a28130fb392522e0..ffb6bd269d695ad781cf2519d5d59e455b55a70c 100644 (file)
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -22,7 +22,7 @@ unsigned show_fps = 0;
 static void usage(char *name)
 {
    fprintf(stderr, "usage: %s [ options ] shader_filename\n", name);
-#ifndef WIN32
+#ifndef _WIN32
    fprintf(stderr, "\n" );
    fprintf(stderr, "options:\n");
    fprintf(stderr, "    -fps  show frames per second\n");

diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c
index 52eb60079768e33542a634678e26e70eef5dd478..48db759a1122b2a65a9035199c99a7489da610c9 100644 (file)
--- a/src/gallium/tests/graw/gs-test.c
+++ b/src/gallium/tests/graw/gs-test.c
@@ -23,7 +23,7 @@ unsigned draw_strip = 0;
 static void usage(char *name)
 {
    fprintf(stderr, "usage: %s [ options ] shader_filename\n", name);
-#ifndef WIN32
+#ifndef _WIN32
    fprintf(stderr, "\n" );
    fprintf(stderr, "options:\n");
    fprintf(stderr, "    -fps  show frames per second\n");

diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index ad524c46537e206d2927e858a4888b7e8764fa2c..d01cdf8e95fd2d63b8011d4e5617bf62723c7061 100644 (file)
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -23,7 +23,7 @@ unsigned show_fps = 0;
 static void usage(char *name)
 {
    fprintf(stderr, "usage: %s [ options ] shader_filename\n", name);
-#ifndef WIN32
+#ifndef _WIN32
    fprintf(stderr, "\n" );
    fprintf(stderr, "options:\n");
    fprintf(stderr, "    -fps  show frames per second\n");

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 91577a81c2d8f24742f12dc3db7b3ad23c2fbf95..087f23892e91d118596e06ad9b15d59398b4f76c 100644 (file)
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -47,7 +47,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <stdint.h>
 #endif
 #include "GL/glxproto.h"

diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index ef759bf7bf365c1495bf120844658974fae256b5..3ef5e08a9c002d2f7688509fdefa57934811340f 100644 (file)
--- a/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -138,7 +138,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                print '#  define GL_PREFIX(n) GLNAME(CONCAT(gl,n))'
                print '# endif'
                print ''
-               print '#if defined(PTHREADS) || defined(WIN32)'
+               print '#if defined(PTHREADS) || defined(_WIN32)'
                print '#  define THREADS'
                print '#endif'
                print ''

diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index b43b65dd8292405e652d1e80a622d18636ac880d..095edcdc035d0983867f3b75953cd15110fb252a 100644 (file)
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -78,7 +78,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                print '#define GLOBL_FN(x) GLOBL x'
                print '#endif'
                print ''
-               print '#if defined(PTHREADS) || defined(WIN32)'
+               print '#if defined(PTHREADS) || defined(_WIN32)'
                print '#  define THREADS'
                print '#endif'
                print ''

diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
index 989f4a3fc30e98f2ce72c50fa5753a4e93f23d1c..be65ebedd1d8293689fc325bb5fbf020878cbec9 100644 (file)
--- a/src/mapi/glapi/glapi_dispatch.c
+++ b/src/mapi/glapi/glapi_dispatch.c
@@ -43,7 +43,7 @@
 
 #if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #define KEYWORD1 GLAPI
 #else
 #define KEYWORD1 PUBLIC

diff --git a/src/mapi/mapi/u_current.c b/src/mapi/mapi/u_current.c
index 21a07abbae509e80f1cc8a435149d0a3a66af2bf..d902375f8c6b77b3558ab3d312ea6a78c48ec8b0 100644 (file)
--- a/src/mapi/mapi/u_current.c
+++ b/src/mapi/mapi/u_current.c
@@ -125,7 +125,7 @@ static int ThreadSafe;
 void
 u_current_destroy(void)
 {
-#if defined(THREADS) && defined(WIN32)
+#if defined(THREADS) && defined(_WIN32)
    u_tsd_destroy(&u_current_table_tsd);
    u_tsd_destroy(&u_current_user_tsd);
 #endif

diff --git a/src/mapi/mapi/u_thread.h b/src/mapi/mapi/u_thread.h
index ffe17b207a334bcae04cfe1d8ef44e4570b0f42b..e53f872c92fb8e8c574772d3874726cda7e76f3e 100644 (file)
--- a/src/mapi/mapi/u_thread.h
+++ b/src/mapi/mapi/u_thread.h
@@ -153,7 +153,7 @@ u_tsd_set(struct u_tsd *tsd, void *ptr)
  * IMPORTANT: Link with multithreaded runtime library when THREADS are
  * used!
  */
-#ifdef WIN32
+#ifdef _WIN32
 
 struct u_tsd {
    DWORD key;
@@ -225,7 +225,7 @@ u_tsd_set(struct u_tsd *tsd, void *ptr)
    }
 }
 
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /*

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 32efe8434150011fe52391e73e722c1eb13cd7dd..a8cddaf8fd74f6ff4be0a2219f9adaa45f4e2085 100644 (file)
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -90,7 +90,7 @@ extern "C" {
 /**
  * Disable assorted warnings
  */
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
+#if !defined(OPENSTEP) && (defined(_WIN32) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
 #  if !defined(__GNUC__) /* mingw environment */
 #    pragma warning( disable : 4068 ) /* unknown pragma */
 #    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
@@ -246,7 +246,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
 
 
 
-#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
+#if !defined(CAPI) && defined(_WIN32) && !defined(BUILD_FOR_SNAP)
 #define CAPI _cdecl
 #endif
 
@@ -256,7 +256,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
  * than GNU C
  */
 #ifndef _ASMAPI
-#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
+#if defined(_WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
 #define _ASMAPI __cdecl
 #else
 #define _ASMAPI

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 0d6b56a518a1c31583368c1190a8c0e17d79d804..9b5f856b0a81218b2fa3617cd559b8cb0f0a7801 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -57,7 +57,7 @@
 #endif
 
 
-#ifdef WIN32
+#ifdef _WIN32
 #define vsnprintf _vsnprintf
 #elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
 extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index b70ee5084dd62dce7ce329198646e816ba18e474..62995072319b33220f66c7b418f863294e932f10 100644 (file)
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -82,7 +82,7 @@ extern void _mesa_test_os_sse_support( void );
 extern void _mesa_test_os_sse_exception_support( void );
 
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #ifndef STATUS_FLOAT_MULTIPLE_TRAPS
 # define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L)
 #endif
@@ -110,7 +110,7 @@ static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp)
 
    return EXCEPTION_CONTINUE_EXECUTION;
 }
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /**
@@ -149,7 +149,7 @@ void _mesa_check_os_sse_support( void )
       if (ret || !enabled)
          _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
    }
-#elif defined(WIN32)
+#elif defined(_WIN32)
    LPTOP_LEVEL_EXCEPTION_FILTER oldFilter;
    
    /* Install our ExceptionFilter */