bring in changes from 6.4 branch

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

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index a4a389ce5d89be74358090add09d3d515e83be87..516ca508c5d47cd19e365fabb805b29d86e8c768 100644 (file)
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"
@@ -166,7 +166,7 @@ ExtractDir(int index, const char *paths, int dirLen, char *dir)
  * \todo
  * Create a macro or something so that this is automatically updated.
  */
-static const char createNewScreenName[] = "__driCreateNewScreen_20050722";
+static const char createNewScreenName[] = "__driCreateNewScreen_20050727";
 
 
 /**
@@ -237,7 +237,7 @@ static __DRIdriver *OpenDriver(const char *driverName)
             return NULL; /* out of memory! */
          }
 
-         driver->createNewScreenFunc = (CreateNewScreenFunc)
+         driver->createNewScreenFunc = (PFNCREATENEWSCREENFUNC)
             dlsym(handle, createNewScreenName);
 
          if ( driver->createNewScreenFunc == NULL ) {
@@ -424,7 +424,8 @@ void *driCreateDisplay(Display *dpy, __DRIdisplay *pdisp)
     pdisp->destroyDisplay = driDestroyDisplay;
 
     /* allocate array of pointers to createNewScreen funcs */
-    pdisp->createNewScreen = (CreateNewScreenFunc *) Xmalloc(numScreens * sizeof(void *));
+    pdisp->createNewScreen = (PFNCREATENEWSCREENFUNC *)
+      Xmalloc(numScreens * sizeof(void *));
     if (!pdisp->createNewScreen) {
        Xfree(pdpyp);
        return NULL;