From 3790199e041236ab8db1effaba2922e10b8b81ac Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Tue, 23 Mar 2010 22:59:44 +0100 Subject: dri: fix dri_test.c for non-TLS build _glapi_Context and _glapi_Dispatch have different constness between TLS and non-TLS builds. --- src/mesa/drivers/dri/common/dri_test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/common') diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c index 6013c02ac5..793f0c37d7 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) {} -- cgit v1.2.3