Make sure THREADS is set no matter which threading model is selected.

diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 9bca436f87f912f63084c19b477b5f8d4280dcb9..346252b7b620cdc47f9ccd72801e1a33ef4581ff 100644 (file)
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -77,6 +77,10 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase):
                print '#define GLOBL_FN(x) GLOBL x'
                print '#endif'
                print ''
+               print '#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+               print '#  define THREADS'
+               print '#endif'
+               print ''
                print '#if defined(PTHREADS)'
                print '#  define GL_STUB(fn,off,fn_alt)\t\t\t\\'
                print 'ALIGNTEXT16;\t\t\t\t\t\t\\'

diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 035d7e0e95000293f2e8300136d3f9e91c099ba8..bc4aca5abc1b6954528cf8b394abd1959bf3b822 100644 (file)
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -47,6 +47,10 @@
 #define GLOBL_FN(x) GLOBL x
 #endif
 
+#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
+#  define THREADS
+#endif
+
 #if defined(PTHREADS)
 #  define GL_STUB(fn,off,fn_alt)                       \
 ALIGNTEXT16;                                           \