restore FASTCALL stuff

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

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 39e5f11e43befbe478d27cdb812385f159a7ecd3..6a31f24dd8cc7641d8dabf74a7363d42f992e4f3 100644 (file)
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -41,14 +41,14 @@
 
 #include <inttypes.h>
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
 #include "glapi.h"
 #ifdef GLX_DIRECT_RENDERING
 #include "indirect_init.h"
-#include "xf86vmode.h"
+#include <X11/extensions/xf86vmode.h>
 #include "xf86dri.h"
 #endif
 #include "glxextensions.h"
@@ -1269,7 +1269,7 @@ PUBLIC const char *glXQueryExtensionsString( Display *dpy, int screen )
 
        __glXCalculateUsableExtensions(psc,
 #ifdef GLX_DIRECT_RENDERING
-                                      (priv->driDisplay.private != NULL),
+                                      (psc->driScreen.private != NULL),
 #else
                                       GL_FALSE,
 #endif
@@ -2886,10 +2886,10 @@ int __glXGetInternalVersion(void)
      * 20040415 - Added support for bindContext3 and unbindContext3.
      * 20040602 - Add __glXGetDrawableInfo.  I though that was there
      *            months ago. :(
-     * 20050725 - Gut all the old interfaces.  This breaks compatability with
+     * 20050727 - Gut all the old interfaces.  This breaks compatability with
      *            any DRI driver built to any previous version.
      */
-    return 20050725;
+    return 20050727;
 }