--- a/src/video/Xext/extensions/extutil.h	Wed Mar 22 04:51:44 2006 +0000
+++ b/src/video/Xext/extensions/extutil.h	Wed Mar 22 05:00:59 2006 +0000
@@ -175,9 +175,9 @@
 
 #define XextHasExtension(i) ((i) && ((i)->codes))
 #define XextCheckExtension(dpy,i,name,val) \
-  if (!XextHasExtension(i)) { pXMissingExtension (dpy, name); return val; }
+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }
 #define XextSimpleCheckExtension(dpy,i,name) \
-  if (!XextHasExtension(i)) { pXMissingExtension (dpy, name); return; }
+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }
 
 
 /*
@@ -190,9 +190,9 @@
 XExtDisplayInfo *proc (Display *dpy) \
 { \
     XExtDisplayInfo *dpyinfo; \
-    if (!extinfo) { if (!(extinfo = pXextCreateExtension())) return NULL; } \
-    if (!(dpyinfo = pXextFindDisplay (extinfo, dpy))) \
-      dpyinfo = pXextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
+    if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
+    if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \
+      dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
     return dpyinfo; \
 }
 
@@ -202,7 +202,7 @@
 #define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
 int proc (Display *dpy, XExtCodes *codes) \
 { \
-    return pXextRemoveDisplay (extinfo, dpy); \
+    return XextRemoveDisplay (extinfo, dpy); \
 }
 
 #define XEXT_CLOSE_DISPLAY_PROTO(proc) \
@@ -215,7 +215,7 @@
     if (code >= 0 && code < nerr) { \
 	char tmp[256]; \
 	SDL_snprintf (tmp, SDL_arraysize(tmp), "%s.%d", extname, code); \
-	pXGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
+	XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
 	return buf; \
     } \
     return (char *)0; \