diff options
| author | RALOVICH, Kristóf <tade60@freemail.hu> | 2009-07-23 17:58:08 +0200 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-07-27 15:38:04 -0600 |
| commit | 8363dff251fc38b044447bcb173d960b03073974 (patch) | |
| tree | d2f5fb1e3780f578b22215d288afa48299ffb19f /src/glx/x11/glxclient.h | |
| parent | 27e55588e0f6c8fb570d3ae601319ed001b7e02a (diff) | |
glx: remove XTHREADS support
Diffstat (limited to 'src/glx/x11/glxclient.h')
| -rw-r--r-- | src/glx/x11/glxclient.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h index bf68d0f891..aff1c85fba 100644 --- a/src/glx/x11/glxclient.h +++ b/src/glx/x11/glxclient.h @@ -55,9 +55,7 @@ #include "GL/internal/glcore.h" #include "glapi/glapitable.h" #include "glxhash.h" -#if defined( USE_XTHREADS ) -# include <X11/Xthreads.h> -#elif defined( PTHREADS ) +#if defined( PTHREADS ) # include <pthread.h> #endif @@ -623,7 +621,7 @@ extern void __glXPreferEGL(int state); extern int __glXDebug; /* This is per-thread storage in an MT environment */ -#if defined( USE_XTHREADS ) || defined( PTHREADS ) +#if defined( PTHREADS ) extern void __glXSetCurrentContext(__GLXcontext *c); @@ -646,7 +644,7 @@ extern __GLXcontext *__glXcurrentContext; #define __glXGetCurrentContext() __glXcurrentContext #define __glXSetCurrentContext(gc) __glXcurrentContext = gc -#endif /* defined( USE_XTHREADS ) || defined( PTHREADS ) */ +#endif /* defined( PTHREADS ) */ extern void __glXSetCurrentContextNull(void); @@ -657,11 +655,7 @@ extern void __glXFreeContext(__GLXcontext*); ** Global lock for all threads in this address space using the GLX ** extension */ -#if defined( USE_XTHREADS ) -extern xmutex_rec __glXmutex; -#define __glXLock() xmutex_lock(&__glXmutex) -#define __glXUnlock() xmutex_unlock(&__glXmutex) -#elif defined( PTHREADS ) +#if defined( PTHREADS ) extern pthread_mutex_t __glXmutex; #define __glXLock() pthread_mutex_lock(&__glXmutex) #define __glXUnlock() pthread_mutex_unlock(&__glXmutex) |