diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-03-23 22:59:44 +0100 |
---|---|---|
committer | Luca Barbieri <luca@luca-barbieri.com> | 2010-03-23 22:59:44 +0100 |
commit | 3790199e041236ab8db1effaba2922e10b8b81ac (patch) | |
tree | 771d028a9b39c574ab0b2db672e99d703d511d0d | |
parent | 5f229547a525554ded621f4f245e22c9090e9205 (diff) | |
download | external_mesa3d-3790199e041236ab8db1effaba2922e10b8b81ac.zip external_mesa3d-3790199e041236ab8db1effaba2922e10b8b81ac.tar.gz external_mesa3d-3790199e041236ab8db1effaba2922e10b8b81ac.tar.bz2 |
dri: fix dri_test.c for non-TLS build
_glapi_Context and _glapi_Dispatch have different constness between
TLS and non-TLS builds.
-rw-r--r-- | src/mesa/drivers/dri/common/dri_test.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c index 6013c02..793f0c3 100644 --- a/src/mesa/drivers/dri/common/dri_test.c +++ b/src/mesa/drivers/dri/common/dri_test.c @@ -17,11 +17,16 @@ PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch PUBLIC __thread void * _glapi_tls_Context __attribute__((tls_model("initial-exec"))); -#endif - PUBLIC const struct _glapi_table *_glapi_Dispatch; PUBLIC const void *_glapi_Context; +#else + +PUBLIC struct _glapi_table *_glapi_Dispatch; +PUBLIC void *_glapi_Context; + +#endif + PUBLIC void _glapi_check_multithread(void) {} |