Merge remote-tracking branch 'origin/master' into pipe-video

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

diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c
index 248d96ac5dedea8fe3a53b5e83dcc7d7d2db73bd..5c181d6db9eae5755e2119b7f6fa7ab9ff5efcc5 100644 (file)
--- a/src/glx/XF86dri.c
+++ b/src/glx/XF86dri.c
@@ -36,25 +36,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 
-#define NEED_REPLIES
 #include <X11/Xlibint.h>
+#include <X11/Xfuncproto.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.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;