diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/glx/glthread.c | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/glx/glthread.c')
| -rw-r--r-- | xorg-server/glx/glthread.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/glx/glthread.c b/xorg-server/glx/glthread.c index b818f4e26..4caaea110 100644 --- a/xorg-server/glx/glthread.c +++ b/xorg-server/glx/glthread.c @@ -31,6 +31,7 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#include <X11/Xfuncproto.h> #endif #include <stdlib.h> @@ -71,7 +72,7 @@ */ #ifdef PTHREADS -unsigned long +_X_EXPORT unsigned long _glthread_GetID(void) { return (unsigned long) pthread_self(); @@ -125,7 +126,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr) #define USE_LOCK_FOR_KEY /* undef this to try a version without lock for the global key... */ -unsigned long +_X_EXPORT unsigned long _glthread_GetID(void) { abort(); /* XXX not implemented yet */ @@ -256,7 +257,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr) */ #ifdef USE_XTHREADS -unsigned long +_X_EXPORT unsigned long _glthread_GetID(void) { return (unsigned long) xthread_self(); @@ -346,7 +347,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr) * no-op functions */ -unsigned long +_X_EXPORT unsigned long _glthread_GetID(void) { return 0; |