diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-05 23:06:42 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-06 16:46:18 +0000 |
| commit | 38591295cd4b68f89f257b20f476f98de3772a47 (patch) | |
| tree | e4e0ddee3adbc931576ae2394a33ddb9eb2e378d /src/glx/glxclient.h | |
| parent | 8b15a883e0ba72c9156d7192a798bb272e0bc528 (diff) | |
glx: remove support for non-multithreaded platforms
Implicitly required for a while, although commit 9385c592c68 (mapi:
remove u_thread.h) was the one that put the final nail on the
coffin.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/glx/glxclient.h')
| -rw-r--r-- | src/glx/glxclient.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index a140c8708c..4211d31d6d 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -47,15 +47,13 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <pthread.h> #ifdef _WIN32 #include <stdint.h> #endif #include "GL/glxproto.h" #include "glxconfig.h" #include "glxhash.h" -#if defined( HAVE_PTHREAD ) -# include <pthread.h> -#endif #include "util/macros.h" #include "glxextensions.h" @@ -631,7 +629,6 @@ extern void __glXPreferEGL(int state); extern int __glXDebug; /* This is per-thread storage in an MT environment */ -#if defined( HAVE_PTHREAD ) extern void __glXSetCurrentContext(struct glx_context * c); @@ -648,14 +645,6 @@ extern struct glx_context *__glXGetCurrentContext(void); # endif /* defined( GLX_USE_TLS ) */ -#else - -extern struct glx_context *__glXcurrentContext; -#define __glXGetCurrentContext() __glXcurrentContext -#define __glXSetCurrentContext(gc) __glXcurrentContext = gc - -#endif /* defined( HAVE_PTHREAD ) */ - extern void __glXSetCurrentContextNull(void); @@ -663,14 +652,9 @@ extern void __glXSetCurrentContextNull(void); ** Global lock for all threads in this address space using the GLX ** extension */ -#if defined( HAVE_PTHREAD ) extern pthread_mutex_t __glXmutex; #define __glXLock() pthread_mutex_lock(&__glXmutex) #define __glXUnlock() pthread_mutex_unlock(&__glXmutex) -#else -#define __glXLock() -#define __glXUnlock() -#endif /* ** Setup for a command. Initialize the extension for dpy if necessary. |