From 711555d1e347f0e64e6b1b2d0e402e0ee72ace07 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 3 Aug 2005 23:05:25 +0000 Subject: [PATCH] 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. --- src/glx/x11/glxclient.h | 8 ++++---- src/glx/x11/glxext.c | 4 ++-- src/mesa/glapi/gl_x86-64_asm.py | 2 +- src/mesa/glapi/gl_x86_asm.py | 2 +- src/mesa/glapi/glthread.c | 2 +- src/mesa/glapi/glthread.h | 6 +++--- src/mesa/x86-64/glapi_x86-64.S | 2 +- src/mesa/x86/glapi_x86.S | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h index 4f29cd1c549..bc9a94c5d5b 100644 --- a/src/glx/x11/glxclient.h +++ b/src/glx/x11/glxclient.h @@ -60,7 +60,7 @@ #include "GL/internal/glcore.h" #include "glapitable.h" #include "glxextensions.h" -#if defined( XTHREADS ) +#if defined( USE_XTHREADS ) # include #elif defined( PTHREADS ) # include @@ -547,7 +547,7 @@ extern __GLXdisplayPrivate *__glXInitialize(Display*); extern int __glXDebug; /* This is per-thread storage in an MT environment */ -#if defined( XTHREADS ) || defined( PTHREADS ) +#if defined( USE_XTHREADS ) || defined( PTHREADS ) extern void __glXSetCurrentContext(__GLXcontext *c); @@ -570,14 +570,14 @@ extern __GLXcontext *__glXcurrentContext; #define __glXGetCurrentContext() __glXcurrentContext #define __glXSetCurrentContext(gc) __glXcurrentContext = gc -#endif /* defined( XTHREADS ) || defined( PTHREADS ) */ +#endif /* defined( USE_XTHREADS ) || defined( PTHREADS ) */ /* ** Global lock for all threads in this address space using the GLX ** extension */ -#if defined( XTHREADS ) +#if defined( USE_XTHREADS ) extern xmutex_rec __glXmutex; #define __glXLock() xmutex_lock(&__glXmutex) #define __glXUnlock() xmutex_unlock(&__glXmutex) diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index 89130a58f80..bb6d6ccd0c5 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -145,7 +145,7 @@ static __GLapi *IndirectAPI = NULL; * Current context management and locking */ -#if defined( XTHREADS ) +#if defined( USE_XTHREADS ) /* thread safe */ static GLboolean TSDinitialized = GL_FALSE; @@ -1106,7 +1106,7 @@ __GLXdisplayPrivate *__glXInitialize(Display* dpy) XEDataObject dataObj; int major, minor; -#if defined(XTHREADS) +#if defined(USE_XTHREADS) { static int firstCall = 1; if (firstCall) { 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 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 */ diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S index eccd4aff342..5694a3b11e7 100644 --- a/src/mesa/x86-64/glapi_x86-64.S +++ b/src/mesa/x86-64/glapi_x86-64.S @@ -35,7 +35,7 @@ # define HIDDEN(x) #endif -#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) +#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) # define THREADS #endif diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 42e61e261e9..6e554989c78 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -63,7 +63,7 @@ #define GLOBL_FN(x) GLOBL x #endif -#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) +#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS) # define THREADS #endif -- 2.30.2