#ifndef _U_CURRENT_H_
#define _U_CURRENT_H_
+#include "c99_compat.h"
+#include "util/macros.h"
+
+
#if defined(MAPI_MODE_UTIL) || defined(MAPI_MODE_GLAPI) || \
defined(MAPI_MODE_BRIDGE)
#include "glapi/glapi.h"
-/* ugly renames to match glapi.h */
-#define mapi_table _glapi_table
-
#ifdef GLX_USE_TLS
#define u_current_table _glapi_tls_Dispatch
#define u_current_context _glapi_tls_Context
#else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
-#include "u_compiler.h"
-
-struct mapi_table;
+struct _glapi_table;
#ifdef GLX_USE_TLS
-extern __thread struct mapi_table *u_current_table
+extern __thread struct _glapi_table *u_current_table
__attribute__((tls_model("initial-exec")));
extern __thread void *u_current_context
#else /* GLX_USE_TLS */
-extern struct mapi_table *u_current_table;
+extern struct _glapi_table *u_current_table;
extern void *u_current_context;
#endif /* GLX_USE_TLS */
u_current_destroy(void);
void
-u_current_set_table(const struct mapi_table *tbl);
+u_current_set_table(const struct _glapi_table *tbl);
-struct mapi_table *
+struct _glapi_table *
u_current_get_table_internal(void);
void
void *
u_current_get_context_internal(void);
-static INLINE const struct mapi_table *
+static inline const struct _glapi_table *
u_current_get_table(void)
{
#ifdef GLX_USE_TLS
#endif
}
-static INLINE const void *
+static inline const void *
u_current_get_context(void)
{
#ifdef GLX_USE_TLS