diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-12-02 17:27:05 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-12-02 17:35:03 +0000 |
| commit | e3659329e0b91ea78afe32e231f2f75d3d728af9 (patch) | |
| tree | aeee753d498c148238dbfc9531255078eebbaf60 /src/mapi/glapi | |
| parent | af4f75c8fe1c53b8def966f480e7fda8021f1b63 (diff) | |
WIN32_THREADS -> WIN32
Fixes nasty bug where some parts of the code didn't define WIN32_THREADS
and were using the integer mutex implementation, causing even confusion
to the debuggers.
And there is little interest of other thread implemenation on Win32
besides Win32 threads.
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/SConscript | 1 | ||||
| -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_x86-64.S | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi_x86.S | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 77a5f9bd2e3..4ef855fc350 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -16,7 +16,6 @@ if env['platform'] != 'winddk': env.Append(CPPDEFINES = [ '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers - 'WIN32_THREADS', # use Win32 thread API ]) env.Append(CPPPATH = [ diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py index e6e78c42f3b..2fa140dc308 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_THREADS) || defined(BEOS_THREADS)' + print '#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)' 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 3b1d035f04a..21996a39421 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_THREADS) || defined(BEOS_THREADS)' + print '#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)' print '# define THREADS' print '#endif' print '' diff --git a/src/mapi/glapi/glapi_x86-64.S b/src/mapi/glapi/glapi_x86-64.S index ce0cf680b1d..af46f2b337e 100644 --- a/src/mapi/glapi/glapi_x86-64.S +++ b/src/mapi/glapi/glapi_x86-64.S @@ -45,7 +45,7 @@ # define GL_PREFIX(n) GLNAME(CONCAT(gl,n)) # endif -#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) +#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS) # define THREADS #endif diff --git a/src/mapi/glapi/glapi_x86.S b/src/mapi/glapi/glapi_x86.S index 72729f2f091..215295d69b2 100644 --- a/src/mapi/glapi/glapi_x86.S +++ b/src/mapi/glapi/glapi_x86.S @@ -51,7 +51,7 @@ #define GLOBL_FN(x) GLOBL x #endif -#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) +#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS) # define THREADS #endif |