mesa: Branch 'master'

[Adam Jackson]

 src/glx/x11/dri_glx.c |    5 +++--
 src/glx/x11/glxext.c  |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
diff-tree d8bfc42bb778e46e64569a6f621e9d41ddca2e59 (from ca7885f7337141b50abd8f64d8773cabbf0256fe)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Sun Apr 8 14:40:03 2007 -0400

    Make sure GLX entrypoints are marked PUBLIC.
    
    Fedora bug #229808.

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index a8d9306..5cf9923 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -39,6 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
+#include "glheader.h"
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"
@@ -342,7 +343,7 @@ __DRIdriver *driGetDriver(Display *dpy, 
  * The returned char pointer points to a static array that will be
  * overwritten by subsequent calls.
  */
-const char *glXGetScreenDriver (Display *dpy, int scrNum) {
+PUBLIC const char *glXGetScreenDriver (Display *dpy, int scrNum) {
    static char ret[32];
    char *driverName;
    if (GetDriverName(dpy, scrNum, &driverName)) {
@@ -371,7 +372,7 @@ const char *glXGetScreenDriver (Display 
  *
  * Note: The driver remains opened after this function returns.
  */
-const char *glXGetDriverConfig (const char *driverName) {
+PUBLIC const char *glXGetDriverConfig (const char *driverName) {
    __DRIdriver *driver = OpenDriver (driverName);
    if (driver)
       return dlsym (driver->handle, "__driConfigOptions");
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index a039bca..95e7d6f 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1488,7 +1488,7 @@ void __glXSendLargeCommand(__GLXcontext 
 
 /************************************************************************/
 
-GLXContext glXGetCurrentContext(void)
+PUBLIC GLXContext glXGetCurrentContext(void)
 {
     GLXContext cx = __glXGetCurrentContext();
     
@@ -1499,7 +1499,7 @@ GLXContext glXGetCurrentContext(void)
     }
 }
 
-GLXDrawable glXGetCurrentDrawable(void)
+PUBLIC GLXDrawable glXGetCurrentDrawable(void)
 {
     GLXContext gc = __glXGetCurrentContext();
     return gc->currentDrawable;