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.
This commit is contained in:
@@ -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 = [
|
||||
|
||||
@@ -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 ''
|
||||
|
||||
@@ -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 ''
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user