diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 22:17:40 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 22:17:40 +0100 |
| commit | 8574eba804031f6b19713f0b02952280730bf62e (patch) | |
| tree | 9afa4d6fe299d43ab7e580dc08a5547120274561 /mesalib/src/mapi/glapi/glapi.h | |
| parent | eef70231353a6103f47fcae88a6e89e765e5cd47 (diff) | |
| download | vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.tar.gz vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.tar.bz2 vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.zip | |
fontconfig mesa git update 5 Mar 2015
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi.h')
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h index e2fa9252f..8d991fb3b 100644 --- a/mesalib/src/mapi/glapi/glapi.h +++ b/mesalib/src/mapi/glapi/glapi.h @@ -44,7 +44,7 @@ #ifndef _GLAPI_H #define _GLAPI_H -#include "u_thread.h" +#include "util/macros.h" #ifdef __cplusplus @@ -102,21 +102,12 @@ _GLAPI_EXPORT extern const void *_glapi_Context; _GLAPI_EXPORT extern struct _glapi_table *_glapi_Dispatch; _GLAPI_EXPORT extern void *_glapi_Context; -# ifdef THREADS - -# define GET_DISPATCH() \ +#define GET_DISPATCH() \ (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch()) -# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \ +#define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \ (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context()) -# else - -# define GET_DISPATCH() _glapi_Dispatch -# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_Context - -# endif - #endif /* defined (GLX_USE_TLS) */ |