From 38591295cd4b68f89f257b20f476f98de3772a47 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 5 Mar 2015 23:06:42 +0000 Subject: 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 --- src/glx/glxclient.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/glx/glxclient.h') diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index a140c8708ca..4211d31d6dd 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -47,15 +47,13 @@ #include #include #include +#include #ifdef _WIN32 #include #endif #include "GL/glxproto.h" #include "glxconfig.h" #include "glxhash.h" -#if defined( HAVE_PTHREAD ) -# include -#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. -- cgit v1.2.3