Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa xserver git update 9 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	xorg-server/hw/kdrive/ephyr/hostx.c

1 files changed, 15 insertions, 15 deletions

diff --git a/mesalib/src/mapi/u_current.h b/mesalib/src/mapi/u_current.h
index f9cffd8c3..72708d433 100644
--- a/mesalib/src/mapi/u_current.h
+++ b/mesalib/src/mapi/u_current.h
@@ -11,14 +11,14 @@
 
 #ifdef GLX_USE_TLS
 #define u_current_table _glapi_tls_Dispatch
-#define u_current_user _glapi_tls_Context
+#define u_current_context _glapi_tls_Context
 #else
 #define u_current_table _glapi_Dispatch
-#define u_current_user _glapi_Context
+#define u_current_context _glapi_Context
 #endif
 
-#define u_current_get_internal _glapi_get_dispatch
-#define u_current_get_user_internal _glapi_get_context
+#define u_current_get_table_internal _glapi_get_dispatch
+#define u_current_get_context_internal _glapi_get_context
 
 #define u_current_table_tsd _gl_DispatchTSD
 
@@ -33,13 +33,13 @@ struct mapi_table;
 extern __thread struct mapi_table *u_current_table
     __attribute__((tls_model("initial-exec")));
 
-extern __thread void *u_current_user
+extern __thread void *u_current_context
     __attribute__((tls_model("initial-exec")));
 
 #else /* GLX_USE_TLS */
 
 extern struct mapi_table *u_current_table;
-extern void *u_current_user;
+extern void *u_current_context;
 
 #endif /* GLX_USE_TLS */
 
@@ -52,35 +52,35 @@ void
 u_current_destroy(void);
 
 void
-u_current_set(const struct mapi_table *tbl);
+u_current_set_table(const struct mapi_table *tbl);
 
 struct mapi_table *
-u_current_get_internal(void);
+u_current_get_table_internal(void);
 
 void
-u_current_set_user(const void *ptr);
+u_current_set_context(const void *ptr);
 
 void *
-u_current_get_user_internal(void);
+u_current_get_context_internal(void);
 
 static INLINE const struct mapi_table *
-u_current_get(void)
+u_current_get_table(void)
 {
 #ifdef GLX_USE_TLS
    return u_current_table;
 #else
    return (likely(u_current_table) ?
-         u_current_table : u_current_get_internal());
+         u_current_table : u_current_get_table_internal());
 #endif
 }
 
 static INLINE const void *
-u_current_get_user(void)
+u_current_get_context(void)
 {
 #ifdef GLX_USE_TLS
-   return u_current_user;
+   return u_current_context;
 #else
-   return likely(u_current_user) ? u_current_user : u_current_get_user_internal();
+   return likely(u_current_context) ? u_current_context : u_current_get_context_internal();
 #endif
 }