diff options
| author | Vinson Lee <[email protected]> | 2012-09-04 22:53:42 -0700 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2012-09-05 22:14:32 -0700 |
| commit | 17a574d7cd8c541c902cc0da40362a32d965e77b (patch) | |
| tree | 749c3734460efa898e72f17dd85b7065e6104de5 /src/mapi/glapi | |
| parent | df5eb0c9bc951a8f69ebaa70e6cccdb9e8b27c04 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/gl_x86-64_asm.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_x86_asm.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi_dispatch.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py index ef759bf7bf3..3ef5e08a9c0 100644 --- 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 b43b65dd829..095edcdc035 100644 --- 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 989f4a3fc30..be65ebedd1d 100644 --- 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 |