diff options
| author | Ian Romanick <[email protected]> | 2005-08-03 23:05:25 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2005-08-03 23:05:25 +0000 |
| commit | 711555d1e347f0e64e6b1b2d0e402e0ee72ace07 (patch) | |
| tree | f924099e8068be7e4b605466bcb1e81f03cc9d1c /src/glx/x11 | |
| parent | 7f5925d57c1405ff40acb2fd40b41ab4f189f7a4 (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/glx/x11')
| -rw-r--r-- | src/glx/x11/glxclient.h | 8 | ||||
| -rw-r--r-- | src/glx/x11/glxext.c | 4 |
2 files changed, 6 insertions, 6 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 <X11/Xthreads.h> #elif defined( PTHREADS ) # include <pthread.h> @@ -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) { |