diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 10:22:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 10:22:02 +0000 |
| commit | 0b9b391c5a7acb31e5d8061169649043a38d6d0e (patch) | |
| tree | 5187c73f0b1abd3cb8fec9706a24251aacecdceb /xorg-server/glx | |
| parent | 272e57235cd60a2e65ac8258d96a02eb3939b687 (diff) | |
| download | vcxsrv-0b9b391c5a7acb31e5d8061169649043a38d6d0e.tar.gz vcxsrv-0b9b391c5a7acb31e5d8061169649043a38d6d0e.tar.bz2 vcxsrv-0b9b391c5a7acb31e5d8061169649043a38d6d0e.zip | |
xserver xkeyboard-config mesa git update 28 Mar 2011
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glapi.c | 4 | ||||
| -rw-r--r-- | xorg-server/glx/glapi.h | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glthread.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c index 209ae50c0..19576a775 100644 --- a/xorg-server/glx/glapi.c +++ b/xorg-server/glx/glapi.c @@ -184,11 +184,11 @@ static GLint NoOpUnused(void) /*@{*/ #if defined(GLX_USE_TLS) -PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch +PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch __attribute__((tls_model("initial-exec"))) = (struct _glapi_table *) __glapi_noop_table; -PUBLIC __thread void * _glapi_tls_Context +PUBLIC TLS void * _glapi_tls_Context __attribute__((tls_model("initial-exec"))); PUBLIC const struct _glapi_table *_glapi_Dispatch = NULL; diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index 80b53aa92..dec8328cd 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -83,7 +83,7 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); const extern void *_glapi_Context; const extern struct _glapi_table *_glapi_Dispatch; -extern __thread void * _glapi_tls_Context +extern TLS void * _glapi_tls_Context __attribute__((tls_model("initial-exec"))); # define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) _glapi_tls_Context diff --git a/xorg-server/glx/glthread.h b/xorg-server/glx/glthread.h index 28793fcc7..140e2aa8e 100644 --- a/xorg-server/glx/glthread.h +++ b/xorg-server/glx/glthread.h @@ -233,7 +233,7 @@ _glthread_SetTSD(_glthread_TSD *, void *); #if defined(GLX_USE_TLS) -extern __thread struct _glapi_table * _glapi_tls_Dispatch +extern TLS struct _glapi_table * _glapi_tls_Dispatch __attribute__((tls_model("initial-exec"))); #define GET_DISPATCH() _glapi_tls_Dispatch |