xserver: Branch 'master'

[Paulo Cesar Pereira de Andrade]

 glx/glapi.c    |    2 +-
 glx/glthread.c |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 295a3fa721ee2f2226891de308c0c4b0ee26fe72
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Wed Dec 17 02:04:12 2008 -0200

    Ensure symbols required by swrast_dri.so are visible.

diff --git a/glx/glapi.c b/glx/glapi.c
index 62597e4..fa3808e 100644
--- a/glx/glapi.c
+++ b/glx/glapi.c
@@ -243,7 +243,7 @@ str_dup(const char *str)
  * We should call this periodically from a function such as glXMakeCurrent
  * in order to test if multiple threads are being used.
  */
-void
+PUBLIC void
 _glapi_check_multithread(void)
 {
 #if defined(THREADS) && !defined(GLX_USE_TLS)
diff --git a/glx/glthread.c b/glx/glthread.c
index b818f4e..4caaea1 100644
--- a/glx/glthread.c
+++ b/glx/glthread.c
@@ -31,6 +31,7 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#include <X11/Xfuncproto.h>
 #endif
 
 #include <stdlib.h>
@@ -71,7 +72,7 @@
  */
 #ifdef PTHREADS
 
-unsigned long
+_X_EXPORT unsigned long
 _glthread_GetID(void)
 {
    return (unsigned long) pthread_self();
@@ -125,7 +126,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 #define USE_LOCK_FOR_KEY	/* undef this to try a version without
 				   lock for the global key... */
 
-unsigned long
+_X_EXPORT unsigned long
 _glthread_GetID(void)
 {
    abort();   /* XXX not implemented yet */
@@ -256,7 +257,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
  */
 #ifdef USE_XTHREADS
 
-unsigned long
+_X_EXPORT unsigned long
 _glthread_GetID(void)
 {
    return (unsigned long) xthread_self();
@@ -346,7 +347,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
  * no-op functions
  */
 
-unsigned long
+_X_EXPORT unsigned long
 _glthread_GetID(void)
 {
    return 0;