diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-29 09:42:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-29 09:42:51 +0000 |
| commit | 534bc3bc51bbb79d45bcfa1254ca3f6c5d282cbe (patch) | |
| tree | 71b64009696a5d2bda6c94165453199d8277357a | |
| parent | 3e9d91227e6125d7b5bed0dc3892dbd66d3594fd (diff) | |
| download | vcxsrv-534bc3bc51bbb79d45bcfa1254ca3f6c5d282cbe.tar.gz vcxsrv-534bc3bc51bbb79d45bcfa1254ca3f6c5d282cbe.tar.bz2 vcxsrv-534bc3bc51bbb79d45bcfa1254ca3f6c5d282cbe.zip | |
Synchronised files
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi.h | 6 | ||||
| -rw-r--r-- | xorg-server/glx/glapi.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h index 98f3913a9..746692692 100644 --- a/mesalib/src/mapi/glapi/glapi.h +++ b/mesalib/src/mapi/glapi/glapi.h @@ -94,14 +94,12 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); **/
#if defined (GLX_USE_TLS)
-_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch
- __attribute__((tls_model("initial-exec")));
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;
_GLAPI_EXPORT extern const void *_glapi_Context;
_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
-_GLAPI_EXPORT extern __thread void * _glapi_tls_Context
- __attribute__((tls_model("initial-exec")));
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;
# define GET_DISPATCH() _glapi_tls_Dispatch
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_tls_Context
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index 2595087f9..746692692 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -94,13 +94,12 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); **/
#if defined (GLX_USE_TLS)
-_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch
- __attribute__((tls_model("initial-exec")));
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;
_GLAPI_EXPORT extern const void *_glapi_Context;
_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
-_GLAPI_EXPORT extern __thread void * _glapi_tls_Context
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;
# define GET_DISPATCH() _glapi_tls_Dispatch
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_tls_Context
|