Merge remote branch 'origin/gallium-0.2' into gallium-0.2

[mesa.git] / src / glx / x11 / XF86dri.c

diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index b44ebaf32960d3d0988a80a9561576e2efa7d658..cd0adc3930f155584029396698e88beeb4ef7f0c 100644 (file)
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -43,9 +42,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#include "glheader.h"
 #include "xf86dristr.h"
 
+
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#  define PUBLIC __attribute__((visibility("default")))
+#  define USED __attribute__((used))
+#else
+#  define PUBLIC
+#  define USED
+#endif
+
+
+
 static XExtensionInfo _xf86dri_info_data;
 static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
 static char xf86dri_extension_name[] = XF86DRINAME;
@@ -375,8 +384,8 @@ PUBLIC Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
                                           context, hHWContext );
 }
 
-PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen, 
-    __DRIid context )
+PUBLIC Bool XF86DRIDestroyContext(Display *dpy, int screen, 
+    XID context )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyContextReq *req;
@@ -396,8 +405,8 @@ PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen,
     return True;
 }
 
-PUBLIC GLboolean XF86DRICreateDrawable(Display *dpy, int screen, 
-    __DRIid drawable, drm_drawable_t * hHWDrawable )
+PUBLIC Bool XF86DRICreateDrawable(Display *dpy, int screen, 
+    XID drawable, drm_drawable_t * hHWDrawable )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRICreateDrawableReply rep;
@@ -430,8 +439,8 @@ static int noopErrorHandler(Display *dpy, XErrorEvent *xerr)
     return 0;
 }
 
-PUBLIC GLboolean XF86DRIDestroyDrawable(Display *dpy, int screen,
-    __DRIid drawable )
+PUBLIC Bool XF86DRIDestroyDrawable(Display *dpy, int screen,
+    XID drawable )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyDrawableReq *req;
@@ -452,7 +461,7 @@ PUBLIC GLboolean XF86DRIDestroyDrawable(Display *dpy, int screen,
      * the windows is gone, by wrapping the destroy call in an error
      * handler. */
 
-    XSync(dpy, GL_FALSE);
+    XSync(dpy, False);
     oldXErrorHandler = XSetErrorHandler(noopErrorHandler);
 
     LockDisplay(dpy);