Index: lib/GL/apple/dri_dispatch.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_dispatch.h,v
retrieving revision 1.6
diff -u -r1.6 dri_dispatch.h
--- lib/GL/apple/dri_dispatch.h	3 Jul 2005 07:00:55 -0000	1.6
+++ lib/GL/apple/dri_dispatch.h	16 Apr 2006 21:46:08 -0000
@@ -1659,10 +1659,12 @@
     (void *rend, GLclampf value, GLboolean invert),
     (value, invert))
 
+/*
 DEFUN_EXTERN_VOID (__unused413,
     (),
     ())
 
+*/
 DEFUN_ALIAS_VOID (PolygonOffsetEXT, PolygonOffset,
     (GLfloat factor, GLfloat bias),
     (factor, bias))
Index: lib/GL/apple/dri_driver.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_driver.c,v
retrieving revision 1.4
diff -u -r1.4 dri_driver.c
--- lib/GL/apple/dri_driver.c	6 May 2005 00:45:30 -0000	1.4
+++ lib/GL/apple/dri_driver.c	16 Apr 2006 21:46:09 -0000
@@ -950,7 +950,7 @@
     psp->drawHash = NULL;
 
     psc->destroyScreen     = driMesaDestroyScreen;
-    psc->createContext     = driMesaCreateContext;
+    psc->createNewContext  = driMesaCreateContext;
     psc->createNewDrawable = driMesaCreateNewDrawable;
     psc->getDrawable       = driMesaGetDrawable;
 
Index: lib/GL/apple/dri_glx.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_glx.c,v
retrieving revision 1.4
diff -u -r1.4 dri_glx.c
--- lib/GL/apple/dri_glx.c	16 Apr 2005 00:21:21 -0000	1.4
+++ lib/GL/apple/dri_glx.c	16 Apr 2006 21:46:09 -0000
@@ -183,7 +183,7 @@
      */
     pdisp->private = NULL;
     pdisp->destroyDisplay = NULL;
-    pdisp->createScreen = NULL;
+    pdisp->createNewScreen = NULL;
 
     if (!XAppleDRIQueryExtension(dpy, &eventBase, &errorBase)) {
         return NULL;
@@ -204,15 +204,15 @@
 
     pdisp->destroyDisplay = driDestroyDisplay;
 
-    /* allocate array of pointers to createScreen funcs */
-    pdisp->createScreen = (CreateScreenFunc *) Xmalloc(numScreens * sizeof(void *));
-    if (!pdisp->createScreen)
+    /* allocate array of pointers to createNewScreen funcs */
+    pdisp->createNewScreen = (PFNCREATENEWSCREENFUNC *) Xmalloc(numScreens * sizeof(void *));
+    if (!pdisp->createNewScreen)
         return NULL;
 
-    /* allocate array of pointers to createScreen funcs */
-    pdisp->createNewScreen = (CreateNewScreenFunc *) Xmalloc(numScreens * sizeof(void *));
+    /* allocate array of pointers to createNewScreen funcs */
+    pdisp->createNewScreen = (PFNCREATENEWSCREENFUNC *) Xmalloc(numScreens * sizeof(void *));
     if (!pdisp->createNewScreen) {
-        Xfree(pdisp->createScreen);
+        Xfree(pdisp->createNewScreen);
         Xfree(pdpyp);
         return NULL;
     }
@@ -221,14 +221,14 @@
     pdpyp->libraryHandles = (void **) Xmalloc(numScreens * sizeof(void*));
     if (!pdpyp->libraryHandles) {
         Xfree(pdisp->createNewScreen);
-        Xfree(pdisp->createScreen);
+        Xfree(pdisp->createNewScreen);
         Xfree(pdpyp);
         return NULL;
     }
 
     /* we'll statically bind to the __driCreateScreen function */
     for (scrn = 0; scrn < numScreens; scrn++) {
-        pdisp->createScreen[scrn] = __driCreateScreen;
+        pdisp->createNewScreen[scrn] = __driCreateScreen;
         pdisp->createNewScreen[scrn] = NULL;
         pdpyp->libraryHandles[scrn] = NULL;
     }