xserver: Branch 'master'

[Eric Anholt]

 glx/glapi.c        |    3 ++-
 glx/glxdri.c       |    2 +-
 glx/glxdri2.c      |    2 +-
 glx/glxdriswrast.c |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 85d84c7cf2d368d1803dc2cdd03d6c9df8cc0430
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 2 17:33:43 2008 -0800

    Fix GLX after 180bad84774493d48f2793a6281d825560944863.
    
    Sigh.

diff --git a/glx/glapi.c b/glx/glapi.c
index 94a8043..62597e4 100644
--- a/glx/glapi.c
+++ b/glx/glapi.c
@@ -53,7 +53,8 @@
 #ifdef HAVE_DIX_CONFIG_H
 
 #include <dix-config.h>
-#define PUBLIC
+#include <X11/Xfuncproto.h>
+#define PUBLIC _X_EXPORT
 
 #else
 
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 090e7ef..8fb90cb 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -1171,7 +1171,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRIProvider = {
+_X_EXPORT __GLXprovider __glXDRIProvider = {
     __glXDRIscreenProbe,
     "DRI",
     NULL
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 4e76c71..87c3959 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -580,7 +580,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRI2Provider = {
+_X_EXPORT __GLXprovider __glXDRI2Provider = {
     __glXDRIscreenProbe,
     "DRI2",
     NULL
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index b425012..5b3ecb0 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -516,7 +516,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRISWRastProvider = {
+_X_EXPORT __GLXprovider __glXDRISWRastProvider = {
     __glXDRIscreenProbe,
     "DRISWRAST",
     NULL