summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2005-08-03 23:05:25 +0000
committerIan Romanick <[email protected]>2005-08-03 23:05:25 +0000
commit711555d1e347f0e64e6b1b2d0e402e0ee72ace07 (patch)
treef924099e8068be7e4b605466bcb1e81f03cc9d1c /src/mesa/glapi
parent7f5925d57c1405ff40acb2fd40b41ab4f189f7a4 (diff)
Convert all instances of XTHREADS to USE_XTHREADS. This fixes one of
serveral things that are broken when building on a system with X.org 7.0rc0 installed.
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/gl_x86-64_asm.py2
-rw-r--r--src/mesa/glapi/gl_x86_asm.py2
-rw-r--r--src/mesa/glapi/glthread.c2
-rw-r--r--src/mesa/glapi/glthread.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index f85f7785b90..483072842a0 100644
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -127,7 +127,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '# define HIDDEN(x)'
print '#endif'
print ''
- print '#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+ print '#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
print '# define THREADS'
print '#endif'
print ''
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index caaa9e83e53..f5196784fb5 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -86,7 +86,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
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 '#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
print '# define THREADS'
print '#endif'
print ''
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 5fa8313975c..0683c1ec76f 100644
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -242,7 +242,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
* XFree86 has its own thread wrapper, Xthreads.h
* We wrap it again for GL.
*/
-#ifdef XTHREADS
+#ifdef USE_XTHREADS
unsigned long
_glthread_GetID(void)
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 503bb44abdf..71e5f339786 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -65,7 +65,7 @@
#if (defined(PTHREADS) || defined(SOLARIS_THREADS) ||\
- defined(WIN32_THREADS) || defined(XTHREADS) || defined(BEOS_THREADS)) \
+ defined(WIN32_THREADS) || defined(USE_XTHREADS) || defined(BEOS_THREADS)) \
&& !defined(THREADS)
# define THREADS
#endif
@@ -193,7 +193,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
* XFree86 has its own thread wrapper, Xthreads.h
* We wrap it again for GL.
*/
-#ifdef XTHREADS
+#ifdef USE_XTHREADS
#include <X11/Xthreads.h>
typedef struct {
@@ -225,7 +225,7 @@ typedef xmutex_rec _glthread_Mutex;
#define _glthread_UNLOCK_MUTEX(name) \
(void) xmutex_unlock(&(name))
-#endif /* XTHREADS */
+#endif /* USE_XTHREADS */