diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
| commit | 3015123fd2904d907896b1aefbe32c267baa2dc2 (patch) | |
| tree | 3adc12a65779305c5fb676be577667ff7e33c389 /xorg-server/glx/glapi.h | |
| parent | 0d9293f57738117231d77df831b6569d4f0739f2 (diff) | |
| parent | 0b9b391c5a7acb31e5d8061169649043a38d6d0e (diff) | |
| download | vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.gz vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.bz2 vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glapi.h')
| -rw-r--r-- | xorg-server/glx/glapi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index a99317ad0..b64ad5d0c 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -77,10 +77,10 @@ struct _glapi_table; #if defined (GLX_USE_TLS)
-_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch
+_GLAPI_EXPORT extern TLS struct _glapi_table * _glapi_tls_Dispatch
__attribute__((tls_model("initial-exec")));
-_GLAPI_EXPORT extern __thread void * _glapi_tls_Context
+_GLAPI_EXPORT extern TLS void * _glapi_tls_Context
__attribute__((tls_model("initial-exec")));
_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
|