diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-09-18 22:09:26 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-10-01 15:23:04 -0700 |
| commit | 814345f54b74eee2597cf84f3c34817488f07522 (patch) | |
| tree | 5a425f04b4fed603ac58f7f47a3faeaf79bc487c /src/glx | |
| parent | b6651ae6ad314a93287e431a41f5c7a8f8f6c855 (diff) | |
build: Use AX_PTHREAD's HAVE_PTHREAD preprocessor definition
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/apple/Makefile | 2 | ||||
| -rw-r--r-- | src/glx/glxclient.h | 8 | ||||
| -rw-r--r-- | src/glx/glxcurrent.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index ef12eb0e299..f6faa1ef71c 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -7,7 +7,7 @@ top_srcdir = $(TOP) include $(TOP)/configs/current #CC=gcc -#GL_CFLAGS=-Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT $(RC_CFLAGS) $(CFLAGS) +#GL_CFLAGS=-Wall -ggdb3 -Os -DHAVE_PTHREAD -D_REENTRANT $(RC_CFLAGS) $(CFLAGS) #GL_LDFLAGS=-L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module TCLSH=tclsh8.5 diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 087f23892e9..e4adedd509b 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -53,7 +53,7 @@ #include "GL/glxproto.h" #include "glxconfig.h" #include "glxhash.h" -#if defined( PTHREADS ) +#if defined( HAVE_PTHREAD ) # include <pthread.h> #endif @@ -623,7 +623,7 @@ extern void __glXPreferEGL(int state); extern int __glXDebug; /* This is per-thread storage in an MT environment */ -#if defined( PTHREADS ) +#if defined( HAVE_PTHREAD ) extern void __glXSetCurrentContext(struct glx_context * c); @@ -646,7 +646,7 @@ extern struct glx_context *__glXcurrentContext; #define __glXGetCurrentContext() __glXcurrentContext #define __glXSetCurrentContext(gc) __glXcurrentContext = gc -#endif /* defined( PTHREADS ) */ +#endif /* defined( HAVE_PTHREAD ) */ extern void __glXSetCurrentContextNull(void); @@ -655,7 +655,7 @@ extern void __glXSetCurrentContextNull(void); ** Global lock for all threads in this address space using the GLX ** extension */ -#if defined( PTHREADS ) +#if defined( HAVE_PTHREAD ) extern pthread_mutex_t __glXmutex; #define __glXLock() pthread_mutex_lock(&__glXmutex) #define __glXUnlock() pthread_mutex_unlock(&__glXmutex) diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c index c92a2fd3cc2..3d8893cf9af 100644 --- a/src/glx/glxcurrent.c +++ b/src/glx/glxcurrent.c @@ -33,7 +33,7 @@ * Client-side GLX interface for current context management. */ -#ifdef PTHREADS +#ifdef HAVE_PTHREAD #include <pthread.h> #endif @@ -73,7 +73,7 @@ struct glx_context dummyContext = { * Current context management and locking */ -#if defined( PTHREADS ) +#if defined( HAVE_PTHREAD ) _X_HIDDEN pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER; |