Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / mesa / glapi / glapi.h

diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index b2a1fe6ee934cdc0d5da24c12e029dd2cb3e99ac..5fb5401229aeb124982be07a8c46af8f39caf7a5 100644 (file)
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -80,8 +80,8 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
  **/
 #if defined (GLX_USE_TLS)
 
-const extern void *_glapi_Context;
-const extern struct _glapi_table *_glapi_Dispatch;
+extern const void *_glapi_Context;
+extern const struct _glapi_table *_glapi_Dispatch;
 
 extern __thread void * _glapi_tls_Context
     __attribute__((tls_model("initial-exec")));
@@ -94,10 +94,7 @@ extern void *_glapi_Context;
 extern struct _glapi_table *_glapi_Dispatch;
 
 # ifdef THREADS
-/* this variable is here only for quick access to current context/dispatch */
-extern GLboolean _glapi_SingleThreaded;
-#  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) \
-       ((_glapi_SingleThreaded) ? _glapi_Context : _glapi_get_context())
+#  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
 # else
 #  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
 # endif