diff -urN virgin/Xext/extutil.c ansi/Xext/extutil.c
--- virgin/Xext/extutil.c	2002-10-15 20:37:27.000000000 -0400
+++ ansi/Xext/extutil.c	2004-08-05 01:26:01.000000000 -0400
@@ -58,7 +58,7 @@
  * information for this extension.  This object is passed to all Xext 
  * routines.
  */
-XExtensionInfo *XextCreateExtension ()
+XExtensionInfo *XextCreateExtension (void)
 {
     register XExtensionInfo *info =
       (XExtensionInfo *) Xmalloc (sizeof (XExtensionInfo));
@@ -75,8 +75,7 @@
 /*
  * XextDestroyExtension - free memory the given extension descriptor
  */
-void XextDestroyExtension (info)
-    XExtensionInfo *info;
+void XextDestroyExtension (XExtensionInfo *info)
 {
     info->head = NULL;			/* to catch refs after this */
     info->cur = NULL;
@@ -89,13 +88,13 @@
 /*
  * XextAddDisplay - add a display to this extension
  */
-XExtDisplayInfo *XextAddDisplay (extinfo, dpy, ext_name, hooks, nevents, data)
-    XExtensionInfo *extinfo;
-    Display *dpy;
-    char *ext_name;
-    XExtensionHooks *hooks;
-    int nevents;
-    XPointer data;
+XExtDisplayInfo *XextAddDisplay (
+    XExtensionInfo *extinfo,
+    Display *dpy,
+    char *ext_name,
+    XExtensionHooks *hooks,
+    int nevents,
+    XPointer data)
 {
     XExtDisplayInfo *dpyinfo;
 
@@ -166,9 +165,7 @@
 /*
  * XextRemoveDisplay - remove the indicated display from the extension object
  */
-int XextRemoveDisplay (extinfo, dpy)
-    XExtensionInfo *extinfo;
-    Display *dpy;
+int XextRemoveDisplay (XExtensionInfo *extinfo, Display *dpy)
 {
     XExtDisplayInfo *dpyinfo, *prev;
 
@@ -207,9 +204,7 @@
  * XextFindDisplay - look for a display in this extension; keeps a cache
  * of the most-recently used for efficiency.
  */
-XExtDisplayInfo *XextFindDisplay (extinfo, dpy)
-    XExtensionInfo *extinfo;
-    Display *dpy;
+XExtDisplayInfo *XextFindDisplay (XExtensionInfo *extinfo, Display *dpy)
 {
     register XExtDisplayInfo *dpyinfo;
 
@@ -237,10 +232,7 @@
 
 
 
-static int _default_exterror (
-    Display *dpy,
-    char *ext_name,
-    char *reason)
+static int _default_exterror (Display *dpy, char *ext_name, char *reason)
 {
     fprintf (stderr, "Xlib:  extension \"%s\" %s on display \"%s\".\n",
 	     ext_name, reason, DisplayString(dpy));
@@ -255,20 +247,7 @@
 
 extern int (*_XExtensionErrorFunction)();
 
-#if NeedFunctionPrototypes
-int (*XSetExtensionErrorHandler(
-    int (*handler)(
-#if NeedNestedPrototypes
-		   Display*,
-		   char *,
-		   char *
-#endif
-		   )
-))()
-#else
-int (*XSetExtensionErrorHandler(handler))()
-    int (*handler)();
-#endif
+int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))()
 {
     int (*oldhandler)() = _XExtensionErrorFunction;
 
@@ -281,15 +260,7 @@
 /*
  * XMissingExtension - call the extension error handler
  */
-#if NeedFunctionPrototypes
-int XMissingExtension (
-    Display *dpy,
-    _Xconst char *ext_name)
-#else
-int XMissingExtension (dpy, ext_name)
-    Display *dpy;
-    char *ext_name;
-#endif
+int XMissingExtension (Display *dpy, _Xconst char *ext_name)
 {
     int (*func)() = (_XExtensionErrorFunction ?
 		     _XExtensionErrorFunction : _default_exterror);
diff -urN virgin/Xext/MITMisc.c ansi/Xext/MITMisc.c
--- virgin/Xext/MITMisc.c	2002-10-15 22:19:22.000000000 -0400
+++ ansi/Xext/MITMisc.c	2004-08-05 01:23:57.000000000 -0400
@@ -76,9 +76,7 @@
  *                                                                           *
  *****************************************************************************/
 
-Bool XMITMiscQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+Bool XMITMiscQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -92,9 +90,7 @@
 }
 
 
-Status XMITMiscSetBugMode(dpy, onOff)
-    Display *dpy;
-    Bool onOff;
+Status XMITMiscSetBugMode(Display *dpy, Bool onOff)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMITSetBugModeReq *req;
@@ -111,8 +107,7 @@
     return 1;
 }
 
-Bool XMITMiscGetBugMode(dpy)
-    Display *dpy;
+Bool XMITMiscGetBugMode(Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMITGetBugModeReq *req;
diff -urN virgin/Xext/XAppgroup.c ansi/Xext/XAppgroup.c
--- virgin/Xext/XAppgroup.c	2002-10-15 22:19:22.000000000 -0400
+++ ansi/Xext/XAppgroup.c	2004-08-05 01:23:16.000000000 -0400
@@ -99,10 +99,10 @@
  *****************************************************************************/
 
 Bool
-XagQueryVersion(dpy, major_version_return, minor_version_return)
-    Display* dpy;
-    int* major_version_return; 
-    int* minor_version_return;
+XagQueryVersion(
+    Display *dpy,
+    int *major_version_return,
+    int *minor_version_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXagQueryVersionReply rep;
@@ -164,7 +164,6 @@
 }
 
 Bool 
-#if NeedFunctionPrototypes
 XagCreateEmbeddedApplicationGroup(
     Display* dpy,
     VisualID root_visual,
@@ -172,14 +171,6 @@
     unsigned long black_pixel,
     unsigned long white_pixel,
     XAppGroup* app_group_return)
-#else
-XagCreateEmbeddedApplicationGroup(dpy, root_visual, default_colormap, black_pixel, white_pixel, app_group_return)
-    Display* dpy;
-    VisualID root_visual;
-    Colormap default_colormap;
-    unsigned long black_pixel, white_pixel;
-    XAppGroup* app_group_return;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXagCreateReq *req;
@@ -214,15 +205,7 @@
 }
 
 Bool 
-#if NeedFunctionPrototypes
-XagCreateNonembeddedApplicationGroup(
-    Display* dpy,
-    XAppGroup* app_group_return)
-#else
-XagCreateNonembeddedApplicationGroup(dpy, app_group_return)
-    Display* dpy;
-    XAppGroup* app_group_return;
-#endif
+XagCreateNonembeddedApplicationGroup(Display* dpy, XAppGroup* app_group_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXagCreateReq *req;
@@ -246,9 +229,7 @@
     return True;
 }
 
-Bool XagDestroyApplicationGroup(dpy,app_group)
-    Display* dpy;
-    XAppGroup app_group;
+Bool XagDestroyApplicationGroup(Display* dpy, XAppGroup app_group)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXagDestroyReq *req;
@@ -266,10 +247,7 @@
 }
 
 Bool
-XagGetApplicationGroupAttributes(
-    Display* dpy,
-    XAppGroup app_group,
-    ...)
+XagGetApplicationGroupAttributes(Display* dpy, XAppGroup app_group, ...)
 {
     va_list var;
     XExtDisplayInfo *info = find_display (dpy);
@@ -331,10 +309,10 @@
 }
 
 Bool
-XagQueryApplicationGroup(dpy, resource, app_group_return)
-    Display* dpy;
-    XID resource;
-    XAppGroup* app_group_return;
+XagQueryApplicationGroup(
+    Display* dpy,
+    XID resource,
+    XAppGroup* app_group_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXagQueryReq *req;
@@ -360,10 +338,7 @@
 }
 
 Bool
-XagCreateAssociation(dpy, window_return, system_window)
-    Display* dpy;
-    Window* window_return;
-    void* system_window;
+XagCreateAssociation(Display* dpy, Window* window_return, void* system_window)
 {
 #ifdef WIN32
     long tmp = *(HWND*) system_window;
@@ -396,9 +371,7 @@
 }
 
 Bool
-XagDestroyAssociation(dpy, window)
-    Display* dpy;
-    Window window;
+XagDestroyAssociation(Display* dpy, Window window)
 {
 #ifdef WIN32
     XExtDisplayInfo *info = find_display (dpy);
diff -urN virgin/Xext/Xcup.c ansi/Xext/Xcup.c
--- virgin/Xext/Xcup.c	2002-10-15 22:19:22.000000000 -0400
+++ ansi/Xext/Xcup.c	2004-08-05 01:21:13.000000000 -0400
@@ -83,10 +83,7 @@
  *****************************************************************************/
 
 Status
-XcupQueryVersion(dpy, major_version_return, minor_version_return)
-    Display* dpy;
-    int* major_version_return; 
-    int* minor_version_return;
+XcupQueryVersion(Display* dpy, int* major_version_return, int* minor_version_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXcupQueryVersionReply rep;
@@ -118,19 +115,11 @@
 #endif
 
 Status 
-#if NeedFunctionPrototypes
 XcupGetReservedColormapEntries(
     Display* dpy,
     int screen,
     XColor** colors_out,
     int* ncolors)
-#else
-XcupGetReservedColormapEntries(dpy, screen, colors_out, ncolors)
-    Display* dpy;
-    int screen;
-    XColor** colors_out;
-    int* ncolors;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXcupGetReservedColormapEntriesReply rep;
@@ -192,19 +181,11 @@
 }
 
 Status
-#if NeedFunctionPrototypes
 XcupStoreColors(
     Display* dpy,
     Colormap colormap,
     XColor* colors_in_out,
     int ncolors)
-#else
-XcupStoreColors(dpy, colormap, colors_in_out, ncolors)
-    Display* dpy;
-    Colormap colormap;
-    XColor* colors_in_out;
-    int ncolors;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXcupStoreColorsReply rep;
diff -urN virgin/Xext/Xdbe.c ansi/Xext/Xdbe.c
--- virgin/Xext/Xdbe.c	2002-10-15 22:19:22.000000000 -0400
+++ ansi/Xext/Xdbe.c	2004-08-05 01:20:14.000000000 -0400
@@ -121,17 +121,10 @@
  *	may be called before this function.   If a client violates this rule,
  *	the effects of all subsequent Xdbe calls are undefined.
  */
-#if NeedFunctionPrototypes
 Status XdbeQueryExtension (
     Display *dpy,
     int *major_version_return,
     int *minor_version_return)
-#else
-Status XdbeQueryExtension (dpy, major_version_return, minor_version_return)
-    Display *dpy;
-    int *major_version_return;
-    int *minor_version_return;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     xDbeGetVersionReply rep;
@@ -189,17 +182,10 @@
  *## swap_action parameter is defined as an unsigned char, not an int.
  *##*/
 
-#if NeedFunctionPrototypes
 XdbeBackBuffer XdbeAllocateBackBufferName(
     Display *dpy,
     Window window,
     XdbeSwapAction swap_action)
-#else
-XdbeBackBuffer XdbeAllocateBackBufferName (dpy, window, swap_action)
-    Display *dpy;
-    Window window;
-    XdbeSwapAction swap_action;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xDbeAllocateBackBufferNameReq *req;
@@ -231,15 +217,9 @@
  *	XdbeAllocateBackBufferName.  The buffer must refer to the back buffer
  *	of the specified window, or a protocol error results.
  */
-#if NeedFunctionPrototypes
 Status XdbeDeallocateBackBufferName (
     Display *dpy,
     XdbeBackBuffer buffer)
-#else
-Status XdbeDeallocateBackBufferName (dpy, buffer)
-    Display *dpy;
-    XdbeBackBuffer buffer;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xDbeDeallocateBackBufferNameReq *req;
@@ -264,17 +244,10 @@
  *	The argument swap_info specifies the information needed per window
  *	to do the swap.
  */
-#if NeedFunctionPrototypes
 Status XdbeSwapBuffers (
     Display *dpy,
     XdbeSwapInfo *swap_info,
     int num_windows)
-#else
-Status XdbeSwapBuffers (dpy, swap_info, num_windows)
-    Display *dpy;
-    XdbeSwapInfo *swap_info;
-    int num_windows;
-#endif
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xDbeSwapBuffersReq *req;
@@ -312,13 +285,7 @@
  * XdbeBeginIdiom -
  *	This function marks the beginning of an idiom sequence.
  */
-#if NeedFunctionPrototypes
-Status XdbeBeginIdiom (
-    Display *dpy)
-#else
-Status XdbeBeginIdiom (dpy)
-    Display *dpy;
-#endif
+Status XdbeBeginIdiom (Display *dpy)
 {
     XExtDisplayInfo *info = find_display(dpy);
     register xDbeBeginIdiomReq *req;
@@ -338,13 +305,7 @@
  * XdbeEndIdiom -
  *	This function marks the end of an idiom sequence.
  */
-#if NeedFunctionPrototypes
-Status XdbeEndIdiom (
-    Display *dpy)
-#else
-Status XdbeEndIdiom (dpy)
-    Display *dpy;
-#endif
+Status XdbeEndIdiom (Display *dpy)
 {
     XExtDisplayInfo *info = find_display(dpy);
     register xDbeEndIdiomReq *req;
@@ -377,17 +338,10 @@
  *	returned list corresponds to the nth screen of the server, starting
  *	with screen zero.
  */
-#if NeedFunctionPrototypes
 XdbeScreenVisualInfo *XdbeGetVisualInfo (
     Display        *dpy,
     Drawable       *screen_specifiers,
     int            *num_screens)  /* SEND and RETURN */
-#else
-XdbeScreenVisualInfo *XdbeGetVisualInfo (dpy, screen_specifiers, num_screens)
-    Display        *dpy;
-    Drawable       *screen_specifiers;
-    int            *num_screens;  /* SEND and RETURN */
-#endif
 {
     XExtDisplayInfo *info = find_display(dpy);
     register xDbeGetVisualInfoReq *req;
@@ -478,13 +432,7 @@
  *	This function frees the list of XdbeScreenVisualInfo returned by the
  *	function XdbeGetVisualInfo.
  */
-#if NeedFunctionPrototypes
-void XdbeFreeVisualInfo(
-    XdbeScreenVisualInfo *visual_info)
-#else
-void XdbeFreeVisualInfo(visual_info)
-    XdbeScreenVisualInfo *visual_info;
-#endif
+void XdbeFreeVisualInfo(XdbeScreenVisualInfo *visual_info)
 {
     if (visual_info == NULL) {
         return;
@@ -503,15 +451,9 @@
  *	This function returns the attributes associated with the specified
  *	buffer.
  */
-#if NeedFunctionPrototypes
 XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
     Display *dpy,
     XdbeBackBuffer buffer)
-#else
-XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(dpy, buffer)
-    Display *dpy;
-    XdbeBackBuffer buffer;
-#endif
 {
     XExtDisplayInfo *info = find_display(dpy);
     register xDbeGetBackBufferAttributesReq *req;

diff -urN virgin/Xext/XEVI.c ansi/Xext/XEVI.c
--- virgin/Xext/XEVI.c	2002-10-15 20:37:27.000000000 -0400
+++ ansi/Xext/XEVI.c	2004-08-05 01:18:21.000000000 -0400
@@ -55,8 +55,7 @@
 static XEXT_GENERATE_FIND_DISPLAY (find_display, xevi_info,
                                    xevi_extension_name,
                                    &xevi_extension_hooks, 0, NULL)
-Bool XeviQueryExtension (dpy)
-    Display *dpy;
+Bool XeviQueryExtension (Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
     if (XextHasExtension(info)) {
@@ -65,9 +64,7 @@
 	return False;
     }
 }
-Bool XeviQueryVersion(dpy, majorVersion, minorVersion)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
+Bool XeviQueryVersion(Display *dpy, int *majorVersion, int *minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xEVIQueryVersionReply rep;
@@ -97,12 +94,12 @@
     }
     return True;
 }
-Status XeviGetVisualInfo(dpy, visual, n_visual, evi_return, n_info_return)
-    register Display *dpy;
-    VisualID *visual;
-    int n_visual;
-    ExtendedVisualInfo **evi_return;
-    int *n_info_return;
+Status XeviGetVisualInfo(
+    register Display *dpy,
+    VisualID *visual,
+    int n_visual,
+    ExtendedVisualInfo **evi_return,
+    int *n_info_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xEVIGetVisualInfoReq *req;
diff -urN virgin/Xext/XLbx.c ansi/Xext/XLbx.c
--- virgin/Xext/XLbx.c	2002-10-15 22:19:22.000000000 -0400
+++ ansi/Xext/XLbx.c	2004-08-05 01:17:17.000000000 -0400
@@ -70,9 +70,9 @@
 				   LbxNumberErrors, lbx_error_list)
 
 
-Bool XLbxQueryExtension (dpy, requestp, event_basep, error_basep)
-    Display *dpy;
-    int *requestp, *event_basep, *error_basep;
+Bool XLbxQueryExtension (
+    Display *dpy,
+    int *requestp, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -99,9 +99,7 @@
 }
 
 
-Bool XLbxQueryVersion(dpy, majorVersion, minorVersion)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
+Bool XLbxQueryVersion(Display *dpy, int *majorVersion, int *minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xLbxQueryVersionReply rep;
diff -urN virgin/Xext/XMultibuf.c ansi/Xext/XMultibuf.c
--- virgin/Xext/XMultibuf.c	2002-10-15 20:37:27.000000000 -0400
+++ ansi/Xext/XMultibuf.c	2004-08-05 01:14:42.000000000 -0400
@@ -54,10 +54,10 @@
 /*
  * find_display - locate the display info block
  */
-static int close_display();
-static char *error_string();
-static Bool wire_to_event();
-static Status event_to_wire();
+static int close_display(Display *dpy, XExtCodes *codes);
+static char *error_string(Display *dpy, int code, XExtCodes *codes, char *buf, int n);
+static Bool wire_to_event(Display *dpy, XEvent *libevent, xEvent *netevent);
+static Status event_to_wire(Display *dpy, XEvent *libevent, xEvent *netevent);
 static /* const */ XExtensionHooks multibuf_extension_hooks = {
     NULL,				/* create_gc */
     NULL,				/* copy_gc */
@@ -91,10 +91,7 @@
  * wire_to_event - convert a wire event in network format to a C 
  * event structure
  */
-static Bool wire_to_event (dpy, libevent, netevent)
-    Display *dpy;
-    XEvent *libevent;
-    xEvent *netevent;
+static Bool wire_to_event (Display *dpy, XEvent *libevent, xEvent *netevent)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -139,10 +136,7 @@
  * event_to_wire - convert a C event structure to a wire event in
  * network format
  */
-static Status event_to_wire (dpy, libevent, netevent)
-    Display *dpy;
-    XEvent  *libevent;
-    xEvent  *netevent;
+static Status event_to_wire (Display *dpy, XEvent *libevent, xEvent *netevent)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -185,9 +179,7 @@
  */
 #define TALLOC(type,count) ((type *) Xmalloc ((unsigned) count * sizeof(type)))
 
-static XmbufBufferInfo *read_buffer_info (dpy, nbufs)
-    Display *dpy;
-    int nbufs;
+static XmbufBufferInfo *read_buffer_info (Display *dpy, int nbufs)
 {
     xMbufBufferInfo *netbuf = TALLOC (xMbufBufferInfo, nbufs);
     XmbufBufferInfo *bufinfo = NULL;
@@ -245,9 +237,9 @@
  * 	MultibufferBadBuffer to get the actual value) is stored into 
  * 	error_base.
  */
-Bool XmbufQueryExtension (dpy, event_base_return, error_base_return)
-    Display *dpy;
-    int *event_base_return, *error_base_return;
+Bool XmbufQueryExtension (
+    Display *dpy,
+    int *event_base_return, int *error_base_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     
@@ -266,9 +258,9 @@
  * 	Gets the major and minor version numbers of the extension.  The return
  * 	value is zero if an error occurs or non-zero if no error happens.
  */
-Status XmbufGetVersion (dpy, major_version_return, minor_version_return)
-    Display *dpy;
-    int *major_version_return, *minor_version_return;
+Status XmbufGetVersion (
+    Display *dpy,
+    int *major_version_return, int *minor_version_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xMbufGetBufferVersionReply rep;
@@ -299,12 +291,12 @@
  * 	number of buffers created is returned (zero if an error occurred)
  * 	and buffers_return is filled in with that many Multibuffer identifiers.
  */
-int XmbufCreateBuffers (dpy, w, count, update_action, update_hint, buffers)
-    Display *dpy;
-    Window w;
-    int count;
-    int update_action, update_hint;
-    Multibuffer *buffers;
+int XmbufCreateBuffers (
+    Display *dpy,
+    Window w,
+    int count,
+    int update_action, int update_hint,
+    Multibuffer *buffers)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xMbufCreateImageBuffersReply rep;
@@ -340,9 +332,7 @@
  * XmbufDestroyBuffers - 
  * 	Destroys the buffers associated with the given window.
  */
-void XmbufDestroyBuffers (dpy, window)
-    Display *dpy;
-    Window  window;
+void XmbufDestroyBuffers (Display *dpy, Window window)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufDestroyImageBuffersReq *req;
@@ -364,11 +354,11 @@
  * 	No two buffers may be associated with the same window or else a Matc
  * 	error is generated.
  */
-void XmbufDisplayBuffers (dpy, count, buffers, min_delay, max_delay)
-    Display *dpy;
-    int count;
-    Multibuffer *buffers;
-    int min_delay, max_delay;
+void XmbufDisplayBuffers (
+    Display *dpy,
+    int count,
+    Multibuffer *buffers,
+    int min_delay, int max_delay)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufDisplayImageBuffersReq *req;
@@ -393,10 +383,10 @@
  * 	with the given window.  Returns non-zero on success and zero if an
  * 	error occurs.
  */
-Status XmbufGetWindowAttributes (dpy, w, attr)
-    Display *dpy;
-    Window w;
-    XmbufWindowAttributes *attr;
+Status XmbufGetWindowAttributes (
+    Display *dpy,
+    Window w,
+    XmbufWindowAttributes *attr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufGetMBufferAttributesReq *req;
@@ -441,11 +431,11 @@
  * 	Sets the multibuffering attributes that apply to all buffers associated
  * 	with the given window.  This is currently limited to the update_hint.
  */
-void XmbufChangeWindowAttributes (dpy, w, valuemask, attr)
-    Display *dpy;
-    Window w;
-    unsigned long valuemask;
-    XmbufSetWindowAttributes *attr;
+void XmbufChangeWindowAttributes (
+    Display *dpy,
+    Window w,
+    unsigned long valuemask,
+    XmbufSetWindowAttributes *attr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufSetMBufferAttributesReq *req;
@@ -476,10 +466,10 @@
  * 	Gets the attributes for the indicated buffer.  Returns non-zero on
  * 	success and zero if an error occurs.
  */
-Status XmbufGetBufferAttributes (dpy, b, attr)
-    Display *dpy;
-    Multibuffer b;
-    XmbufBufferAttributes *attr;
+Status XmbufGetBufferAttributes (
+    Display *dpy,
+    Multibuffer b,
+    XmbufBufferAttributes *attr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufGetBufferAttributesReq *req;
@@ -511,11 +501,11 @@
  * 	Sets the attributes for the indicated buffer.  This is currently
  * 	limited to the event_mask.
  */
-void XmbufChangeBufferAttributes (dpy, b, valuemask, attr)
-    Display *dpy;
-    Multibuffer b;
-    unsigned long valuemask;
-    XmbufSetBufferAttributes *attr;
+void XmbufChangeBufferAttributes (
+    Display *dpy,
+    Multibuffer b,
+    unsigned long valuemask,
+    XmbufSetBufferAttributes *attr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufSetBufferAttributesReq *req;
@@ -555,14 +545,13 @@
  * 	mono_info_return and stereo_info_return may be released by XFree.
  * 	If no errors are encounted, non-zero will be returned.
  */
-Status XmbufGetScreenInfo (dpy, d, nmono_return, mono_info_return,
-			   nstereo_return, stereo_info_return)
-    Display *dpy;
-    Drawable d;
-    int *nmono_return;
-    XmbufBufferInfo **mono_info_return;
-    int *nstereo_return;
-    XmbufBufferInfo **stereo_info_return;
+Status XmbufGetScreenInfo (
+    Display *dpy,
+    Drawable d,
+    int *nmono_return,
+    XmbufBufferInfo **mono_info_return,
+    int *nstereo_return,
+    XmbufBufferInfo **stereo_info_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufGetBufferInfoReq *req;
@@ -611,19 +600,17 @@
  * 	a mono window (in fact, use the same code, except for the request)
  *      and returns the left and right buffers that may be 
  */
-Window XmbufCreateStereoWindow (dpy, parent, x, y, width, height, border_width,
-				depth, class, visual, valuemask, attr,
-				leftp, rightp)
-    Display *dpy;
-    Window parent;
-    int x, y;
-    unsigned int width, height, border_width;
-    int depth;
-    unsigned int class;
-    Visual *visual;
-    unsigned long valuemask;
-    XSetWindowAttributes *attr;
-    Multibuffer *leftp, *rightp;
+Window XmbufCreateStereoWindow (
+    Display *dpy,
+    Window parent,
+    int x, int y,
+    unsigned int width, unsigned int height, unsigned int border_width,
+    int depth,
+    unsigned int class,
+    Visual *visual,
+    unsigned long valuemask,
+    XSetWindowAttributes *attr,
+    Multibuffer *leftp, Multibuffer *rightp)
 {
     XExtDisplayInfo *info = find_display (dpy);
     Window wid;
@@ -698,12 +685,12 @@
     return wid;
 }
 
-void XmbufClearBufferArea (dpy, buffer, x, y, width, height, exposures)
-     Display *dpy;
-     Multibuffer buffer;
-     int x, y;
-     unsigned int width, height;
-     Bool exposures;
+void XmbufClearBufferArea (
+    Display *dpy,
+    Multibuffer buffer,
+    int x, int y,
+    unsigned int width, unsigned int height,
+    Bool exposures)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xMbufClearImageBufferAreaReq *req;

diff -urN virgin/Xext/XShape.c ansi/Xext/XShape.c
--- virgin/Xext/XShape.c	2003-10-01 02:49:39.000000000 -0400
+++ ansi/Xext/XShape.c	2004-08-05 01:08:15.000000000 -0400
@@ -142,9 +142,7 @@
  *                                                                          *
  ****************************************************************************/
 
-Bool XShapeQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+Bool XShapeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -158,9 +156,10 @@
 }
 
 
-Status XShapeQueryVersion(dpy, major_versionp, minor_versionp)
-    Display *dpy;
-    int	    *major_versionp, *minor_versionp;
+Status XShapeQueryVersion(
+    Display *dpy,
+    int *major_versionp,
+    int *minor_versionp)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShapeQueryVersionReply	    rep;
@@ -184,11 +183,12 @@
     return 1;
 }
 
-void XShapeCombineRegion(dpy, dest, destKind, xOff, yOff, r, op)
-register Display    *dpy;
-Window		    dest;
-int		    destKind, op, xOff, yOff;
-register REGION	    *r;
+void XShapeCombineRegion(
+    register Display *dpy,
+    Window dest,
+    int destKind, int xOff, int yOff,
+    register REGION *r,
+    int op)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeRectanglesReq *req;
@@ -229,13 +229,13 @@
 }
 
 
-void XShapeCombineRectangles (dpy, dest, destKind, xOff, yOff,
-			      rects, n_rects, op, ordering)
-register Display *dpy;
-XID dest;
-int destKind, op, xOff, yOff, ordering;
-XRectangle  *rects;
-int n_rects;
+void XShapeCombineRectangles (
+    register Display *dpy,
+    XID dest,
+    int destKind, int xOff, int yOff,
+    XRectangle *rects,
+    int n_rects,
+    int op, int ordering)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeRectanglesReq *req;
@@ -265,12 +265,13 @@
 }
 
 
-void XShapeCombineMask (dpy, dest, destKind, xOff, yOff, src, op)
-register Display *dpy;
-int destKind;
-XID dest;
-Pixmap	src;
-int op, xOff, yOff;
+void XShapeCombineMask (
+    register Display *dpy,
+    XID dest,
+    int destKind,
+    int xOff, int yOff,
+    Pixmap src,
+    int op)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeMaskReq *req;
@@ -291,13 +292,14 @@
     SyncHandle();
 }
 
-void XShapeCombineShape (dpy, dest, destKind, xOff, yOff, src, srcKind, op)
-register Display *dpy;
-int destKind;
-XID dest;
-int srcKind;
-XID src;
-int op, xOff, yOff;
+void XShapeCombineShape (
+    register Display *dpy,
+    XID dest,
+    int destKind,
+    int xOff, int yOff,
+    XID src,
+    int srcKind,
+    int op)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeCombineReq *req;
@@ -319,11 +321,11 @@
     SyncHandle();
 }
 
-void XShapeOffsetShape (dpy, dest, destKind, xOff, yOff)
-register Display *dpy;
-int destKind;
-XID dest;
-int xOff, yOff;
+void XShapeOffsetShape (
+    register Display *dpy,
+    XID dest,
+    int destKind,
+    int xOff, int yOff)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeOffsetReq *req;
@@ -342,14 +344,11 @@
     SyncHandle();
 }
 
-Status XShapeQueryExtents (dpy, window,
-			   bShaped, xbs, ybs, wbs, hbs,
-			   cShaped, xcs, ycs, wcs, hcs)    
-    register Display    *dpy;
-    Window		    window;
-    int			    *bShaped, *cShaped;	    /* RETURN */
-    int			    *xbs, *ybs, *xcs, *ycs; /* RETURN */
-    unsigned int	    *wbs, *hbs, *wcs, *hcs; /* RETURN */
+Status XShapeQueryExtents (
+    register Display *dpy,
+    Window window,
+    int *bShaped, int *xbs, int *ybs, unsigned int *wbs, unsigned int *hbs, /* RETURN */
+    int *cShaped, int *xcs, int *ycs, unsigned int *wcs, unsigned int *hcs /* RETURN */)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShapeQueryExtentsReply	    rep;
@@ -383,10 +382,10 @@
 }
 
 
-void XShapeSelectInput (dpy, window, mask)
-    register Display	*dpy;
-    Window		window;
-    unsigned long	mask;
+void XShapeSelectInput (
+    register Display *dpy,
+    Window window,
+    unsigned long mask)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeSelectInputReq   *req;
@@ -406,9 +405,7 @@
     SyncHandle ();
 }
 
-unsigned long XShapeInputSelected (dpy, window)
-    register Display	*dpy;
-    Window		window;
+unsigned long XShapeInputSelected (register Display *dpy, Window window)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeInputSelectedReq *req;
@@ -432,12 +429,12 @@
 }
 
 
-XRectangle *XShapeGetRectangles (dpy, window, kind, count, ordering)
-    register Display	*dpy;
-    Window		window;
-    int			kind;
-    int			*count;	/* RETURN */
-    int			*ordering; /* RETURN */
+XRectangle *XShapeGetRectangles (
+    register Display *dpy,
+    Window window,
+    int kind,
+    int *count, /* RETURN */
+    int *ordering /* RETURN */)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShapeGetRectanglesReq   *req;
diff -urN virgin/Xext/XShm.c ansi/Xext/XShm.c
--- virgin/Xext/XShm.c	2004-08-04 00:14:52.000000000 -0400
+++ ansi/Xext/XShm.c	2004-08-05 00:56:15.000000000 -0400
@@ -141,9 +141,7 @@
  *                                                                           *
  *****************************************************************************/
 
-Bool XShmQueryExtension (dpy /* event_basep, error_basep */)
-    Display *dpy;
-/*  int *event_basep, *error_basep; */
+Bool XShmQueryExtension (Display *dpy /*  int *event_basep, *error_basep */)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -157,8 +155,7 @@
 }
 
 
-int XShmGetEventBase(dpy)
-    Display *dpy;
+int XShmGetEventBase(Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -170,10 +167,11 @@
 }
 
 
-Bool XShmQueryVersion(dpy, majorVersion, minorVersion, sharedPixmaps)
-    Display *dpy;
-    int	    *majorVersion, *minorVersion;
-    Bool    *sharedPixmaps;
+Bool XShmQueryVersion(
+    Display *dpy,
+    int *majorVersion,
+    int *minorVersion,
+    Bool *sharedPixmaps)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShmQueryVersionReply rep;
@@ -199,8 +197,7 @@
 }
 
 
-int XShmPixmapFormat(dpy)
-    Display *dpy;
+int XShmPixmapFormat(Display *dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xShmQueryVersionReply rep;
@@ -226,9 +223,7 @@
 }
 
 
-Status XShmAttach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
+Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShmAttachReq *req;
@@ -249,9 +244,7 @@
 }
 
 
-Status XShmDetach(dpy, shminfo)
-    Display *dpy;
-    XShmSegmentInfo *shminfo;
+Status XShmDetach(Display *dpy, XShmSegmentInfo *shminfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xShmDetachReq *req;
@@ -268,9 +261,7 @@
     return 1;
 }
 
-static int _XShmDestroyImage (ximage)
-    XImage *ximage;
-
+static int _XShmDestroyImage (XImage *ximage)
 {
 	Xfree((char *)ximage);
 	return 1;
@@ -278,16 +269,15 @@
 
 #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad) - 1)) / (pad)) * (pad))
 
-XImage *XShmCreateImage (dpy, visual, depth, format, data, shminfo,
-			 width, height)
-    register Display *dpy;
-    register Visual *visual;
-    unsigned int depth;
-    int format;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width;
-    unsigned int height;
+XImage *XShmCreateImage (
+    register Display *dpy,
+    register Visual *visual,
+    unsigned int depth,
+    int format,
+    char *data,
+    XShmSegmentInfo *shminfo,
+    unsigned int width,
+    unsigned int height)
 {
     register XImage *image;
 
@@ -323,15 +313,14 @@
     return image;
 }
 
-Status XShmPutImage (dpy, d, gc, image, src_x, src_y, dst_x, dst_y,
-		     src_width, src_height, send_event)
-    register Display *dpy;
-    Drawable d;
-    GC gc;
-    register XImage *image;
-    int src_x, src_y, dst_x, dst_y;
-    unsigned int src_width, src_height;
-    Bool send_event;
+Status XShmPutImage (
+    register Display *dpy,
+    Drawable d,
+    GC gc,
+    register XImage *image,
+    int src_x, int src_y, int dst_x, int dst_y,
+    unsigned int src_width, unsigned int src_height,
+    Bool send_event)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
@@ -366,12 +355,12 @@
 }
 
 
-Status XShmGetImage(dpy, d, image, x, y, plane_mask)
-    register Display *dpy;
-    Drawable d;
-    XImage *image;
-    int x, y;
-    unsigned long plane_mask;
+Status XShmGetImage(
+    register Display *dpy,
+    Drawable d,
+    XImage *image,
+    int x, int y,
+    unsigned long plane_mask)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
@@ -413,12 +402,12 @@
     return 1;
 }
 
-Pixmap XShmCreatePixmap (dpy, d, data, shminfo, width, height, depth)
-    register Display *dpy;
-    Drawable d;
-    char *data;
-    XShmSegmentInfo *shminfo;
-    unsigned int width, height, depth;
+Pixmap XShmCreatePixmap (
+    register Display *dpy,
+    Drawable d,
+    char *data,
+    XShmSegmentInfo *shminfo,
+    unsigned int width, unsigned int height, unsigned int depth)
 {
     XExtDisplayInfo *info = find_display (dpy);
     Pixmap pid;

diff -urN virgin/Xext/XSync.c ansi/Xext/XSync.c
--- virgin/Xext/XSync.c	2004-04-12 10:15:48.000000000 -0400
+++ ansi/Xext/XSync.c	2004-08-05 00:52:33.000000000 -0400
@@ -209,9 +209,9 @@
 }
 
 Status
-XSyncQueryExtension(dpy, event_base_return, error_base_return)
-    Display        *dpy;
-    int  *event_base_return, *error_base_return;
+XSyncQueryExtension(
+    Display *dpy,
+    int *event_base_return, int *error_base_return)
 {
     XExtDisplayInfo *info = find_display(dpy);
 
@@ -226,9 +226,9 @@
 }
 
 Status
-XSyncInitialize(dpy, major_version_return, minor_version_return)
-    Display        *dpy;
-    int *major_version_return, *minor_version_return;
+XSyncInitialize(
+    Display *dpy,
+    int *major_version_return, int *minor_version_return)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncInitializeReply rep;
@@ -260,9 +260,7 @@
 }
 
 XSyncSystemCounter *
-XSyncListSystemCounters(dpy, n_counters_return)
-    Display        *dpy;
-    int		   *n_counters_return;
+XSyncListSystemCounters(Display *dpy, int *n_counters_return)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncListSystemCountersReply rep;
@@ -336,8 +334,7 @@
 }
 
 void
-XSyncFreeSystemCounterList(list)
-    XSyncSystemCounter *list;
+XSyncFreeSystemCounterList(XSyncSystemCounter *list)
 {
     if (list)
     {
@@ -348,9 +345,7 @@
 
 
 XSyncCounter 
-XSyncCreateCounter(dpy, initial_value)
-    Display        *dpy;
-    XSyncValue    initial_value;
+XSyncCreateCounter(Display *dpy, XSyncValue initial_value)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncCreateCounterReq *req;
@@ -372,10 +367,7 @@
 }
 
 Status 
-XSyncSetCounter(dpy, counter, value)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue    value;
+XSyncSetCounter(Display *dpy, XSyncCounter counter, XSyncValue value)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncSetCounterReq *req;
@@ -395,10 +387,7 @@
 }
 
 Status 
-XSyncChangeCounter(dpy, counter, value)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue    value;
+XSyncChangeCounter(Display *dpy, XSyncCounter counter, XSyncValue value)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncChangeCounterReq *req;
@@ -418,9 +407,7 @@
 }
 
 Status 
-XSyncDestroyCounter(dpy, counter)
-    Display        *dpy;
-    XSyncCounter    counter;
+XSyncDestroyCounter(Display *dpy, XSyncCounter counter)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncDestroyCounterReq *req;
@@ -439,10 +426,7 @@
 }
 
 Status 
-XSyncQueryCounter(dpy, counter, value_return)
-    Display        *dpy;
-    XSyncCounter    counter;
-    XSyncValue   *value_return;
+XSyncQueryCounter(Display *dpy, XSyncCounter counter, XSyncValue *value_return)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncQueryCounterReply rep;
@@ -470,10 +454,7 @@
 
 
 Status
-XSyncAwait(dpy, wait_list, n_conditions)
-    Display        *dpy;
-    XSyncWaitCondition *wait_list;
-    int   n_conditions;
+XSyncAwait(Display *dpy, XSyncWaitCondition *wait_list, int n_conditions)
 {
     XExtDisplayInfo *info = find_display(dpy);
     XSyncWaitCondition *wait_item = wait_list;
@@ -550,10 +531,10 @@
 }
 
 XSyncAlarm 
-XSyncCreateAlarm(dpy, values_mask, values)
-    Display        *dpy;
-    unsigned long   values_mask;
-    XSyncAlarmAttributes *values;
+XSyncCreateAlarm(
+    Display *dpy,
+    unsigned long values_mask,
+    XSyncAlarmAttributes *values)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncCreateAlarmReq *req;
@@ -577,9 +558,7 @@
 }
 
 Status
-XSyncDestroyAlarm(dpy, alarm)
-    Display        *dpy;
-    XSyncAlarm      alarm;
+XSyncDestroyAlarm(Display *dpy, XSyncAlarm alarm)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncDestroyAlarmReq *req;
@@ -597,10 +576,10 @@
 }
 
 Status
-XSyncQueryAlarm(dpy, alarm, values_return)
-    Display        *dpy;
-    XSyncAlarm      alarm;
-    XSyncAlarmAttributes *values_return;
+XSyncQueryAlarm(
+    Display *dpy,
+    XSyncAlarm alarm,
+    XSyncAlarmAttributes *values_return)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncQueryAlarmReq *req;
@@ -637,11 +616,11 @@
 }
 
 Status
-XSyncChangeAlarm(dpy, alarm, values_mask, values)
-    Display        *dpy;
-    XSyncAlarm      alarm;
-    unsigned long   values_mask;
-    XSyncAlarmAttributes *values;
+XSyncChangeAlarm(
+    Display *dpy,
+    XSyncAlarm alarm,
+    unsigned long values_mask,
+    XSyncAlarmAttributes *values)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncChangeAlarmReq *req;
@@ -663,10 +642,10 @@
 }
 
 Status
-XSyncSetPriority(dpy, client_resource_id, priority)
-    Display        *dpy;
-    XID             client_resource_id;
-    int             priority;
+XSyncSetPriority(
+    Display *dpy,
+    XID client_resource_id,
+    int priority)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncSetPriorityReq *req;
@@ -685,10 +664,7 @@
 }
 
 Status 
-XSyncGetPriority(dpy, client_resource_id, return_priority)
-    Display        *dpy;
-    XID             client_resource_id;
-    int            *return_priority;
+XSyncGetPriority(Display *dpy, XID client_resource_id, int *return_priority)
 {
     XExtDisplayInfo *info = find_display(dpy);
     xSyncGetPriorityReply rep;
@@ -739,118 +715,100 @@
 #undef XSyncMinValue
 
 void
-XSyncIntToValue(pv, i)
-    XSyncValue *pv;
-    int i;
+XSyncIntToValue(XSyncValue *pv, int i)
 {
     _XSyncIntToValue(pv,i);
 }
 
 void
-XSyncIntsToValue(pv, l, h)
-    XSyncValue *pv;
-    unsigned int l;
-    int h;
+XSyncIntsToValue(XSyncValue *pv, unsigned int l, int h)
 {
     _XSyncIntsToValue(pv, l, h);
 }
 
 Bool
-XSyncValueGreaterThan(a, b)
-    XSyncValue a, b;
+XSyncValueGreaterThan(XSyncValue a, XSyncValue b)
 {
     return _XSyncValueGreaterThan(a, b);
 }
 
 Bool
-XSyncValueLessThan(a, b)
-    XSyncValue a, b;
+XSyncValueLessThan(XSyncValue a, XSyncValue b)
 {
     return _XSyncValueLessThan(a, b);
 }
 
 Bool
-XSyncValueGreaterOrEqual(a, b)
-    XSyncValue a, b;
+XSyncValueGreaterOrEqual(XSyncValue a, XSyncValue b)
 {
     return _XSyncValueGreaterOrEqual(a, b);
 }
 
 Bool
-XSyncValueLessOrEqual(a, b)
-    XSyncValue a, b;
+XSyncValueLessOrEqual(XSyncValue a, XSyncValue b)
 {
     return _XSyncValueLessOrEqual(a, b);
 }
 
 Bool
-XSyncValueEqual(a, b)
-    XSyncValue a, b;
+XSyncValueEqual(XSyncValue a, XSyncValue b)
 {
     return _XSyncValueEqual(a, b);
 }
 
 Bool
-XSyncValueIsNegative(v)
-    XSyncValue v;
+XSyncValueIsNegative(XSyncValue v)
 {
     return _XSyncValueIsNegative(v);
 }
 
 Bool
-XSyncValueIsZero(a)
-    XSyncValue a;
+XSyncValueIsZero(XSyncValue a)
 {
     return _XSyncValueIsZero(a);
 }
 
 Bool
-XSyncValueIsPositive(v)
-    XSyncValue v;
+XSyncValueIsPositive(XSyncValue v)
 {
     return _XSyncValueIsPositive(v);
 }
 
 unsigned int
-XSyncValueLow32(v)
-    XSyncValue v;
+XSyncValueLow32(XSyncValue v)
 {
     return _XSyncValueLow32(v);
 }
 
 int
-XSyncValueHigh32(v)
-    XSyncValue v;
+XSyncValueHigh32(XSyncValue v)
 {
     return _XSyncValueHigh32(v);
 }
 
 void
-XSyncValueAdd(presult, a, b, poverflow)
-    XSyncValue *presult, a, b;
-    Bool *poverflow;
+XSyncValueAdd(XSyncValue *presult, XSyncValue a, XSyncValue b, Bool *poverflow)
 {
     _XSyncValueAdd(presult, a, b, poverflow);
 }
 
 void
-XSyncValueSubtract(presult, a, b, poverflow)
-    XSyncValue *presult, a, b;
-    Bool *poverflow;
+XSyncValueSubtract(
+    XSyncValue *presult,
+    XSyncValue a, XSyncValue b,
+    Bool *poverflow)
 {
     _XSyncValueSubtract(presult, a, b, poverflow);
 }
 
 void
-XSyncMaxValue(pv)
-    XSyncValue *pv;
+XSyncMaxValue(XSyncValue *pv)
 {
     _XSyncMaxValue(pv);
 }
 
 void
-XSyncMinValue(pv)
-    XSyncValue *pv;
+XSyncMinValue(XSyncValue *pv)
 {
     _XSyncMinValue(pv);
 }
diff -urN virgin/Xext/XTestExt1.c ansi/Xext/XTestExt1.c
--- virgin/Xext/XTestExt1.c	2001-12-14 14:55:01.000000000 -0500
+++ ansi/Xext/XTestExt1.c	2004-08-05 00:42:24.000000000 -0400
@@ -113,14 +113,14 @@
  * function declarations
  *****************************************************************************/
 
-static int	XTestWireToEvent();
-static int	XTestCheckExtInit();
-static Bool	XTestIdentifyMyEvent();
-static int	XTestInitExtension();
-static int	XTestKeyOrButton();
-static int	XTestCheckDelay();
-static int	XTestPackInputAction();
-static int	XTestWriteInputActions();
+static int	XTestWireToEvent(Display *dpy, XEvent *reTemp, xEvent *eventTemp);
+static int	XTestCheckExtInit(register Display *dpy);
+static Bool	XTestIdentifyMyEvent(Display *display, XEvent *event_ptr, char *args);
+static int	XTestInitExtension(register Display *dpy);
+static int	XTestKeyOrButton(Display *display, int device_id, long unsigned int delay, unsigned int code, unsigned int action);
+static int	XTestCheckDelay(Display *display, long unsigned int *delay_addr);
+static int	XTestPackInputAction(Display *display, CARD8 *action_addr, int action_size);
+static int	XTestWriteInputActions(Display *display, char *action_list_addr, int action_list_size, int ack_flag);
 
 /******************************************************************************
  *
@@ -130,24 +130,24 @@
  *	to the server by this extension.
  */
 int
-XTestFakeInput(dpy, action_list_addr, action_list_size, ack_flag)
+XTestFakeInput(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy,
 /*
  * the address of a list of input actions to be sent to the server
  */
-char			*action_list_addr;
+char			*action_list_addr,
 /*
  * the size (in bytes) of the list of input actions
  */
-int			action_list_size;
+int			action_list_size,
 /*
  * specifies whether the server needs to send an event to indicate that its
  * input action buffer is empty
  */
-int			ack_flag;
+int			ack_flag)
 {	
 	/*
 	 * pointer to xTestFakeInputReq structure
@@ -224,15 +224,15 @@
  *	to be sent to the client that called this function.
  */
 int
-XTestGetInput(dpy, action_handling)
+XTestGetInput(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy,
 /*
  * tells the server what to do with the user input actions
  */
-int			action_handling;
+int			action_handling)
 {	
 	/*
 	 * pointer to xTestGetInputReq structure
@@ -286,11 +286,11 @@
  *	into events.
  */
 int
-XTestStopInput(dpy)
+XTestStopInput(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy)
 {	
 	/*
 	 * pointer to xTestStopInputReq structure
@@ -340,11 +340,11 @@
  *	back to its initial state.
  */
 int
-XTestReset(dpy)
+XTestReset(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy)
 {	
 	/*
 	 * pointer to xTestReset structure
@@ -393,16 +393,16 @@
  *	Returns the number of input actions in the server's input action buffer.
  */
 int
-XTestQueryInputSize(dpy, size_return)
+XTestQueryInputSize(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy,
 /*
  * the address of the place to put the number of input actions in the
  * server's input action buffer
  */
-unsigned long		*size_return;
+unsigned long		*size_return)
 {	
 	/*
 	 * pointer to xTestQueryInputSize structure
@@ -463,11 +463,11 @@
  *	Check to see if the XTest extension is installed in the server.
  */
 static int
-XTestCheckExtInit(dpy)
+XTestCheckExtInit(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy)
 {
 	/*
 	 * if the extension has not been initialized, then do so
@@ -487,11 +487,11 @@
  *	succeeds, -1 if it does not succeed.
  */
 static int
-XTestInitExtension(dpy)
+XTestInitExtension(
 /*
  * the connection to the X server
  */
-register Display	*dpy;
+register Display	*dpy)
 {
 	/*
 	 * loop index
@@ -548,20 +548,20 @@
  *	Reformat a wire event into an XEvent structure of the right type.
  */
 static Bool
-XTestWireToEvent(dpy, reTemp, eventTemp)
+XTestWireToEvent(
 /*
  * the connection to the X server
  */
-Display	*dpy;
+Display	*dpy,
 /*
  * a pointer to where a host formatted event should be stored
  * with the information copied to it
  */
-XEvent	*reTemp;
+XEvent	*reTemp,
 /*
  * a pointer to the wire event
  */
-xEvent	*eventTemp;
+xEvent	*eventTemp)
 {
 	XTestInputActionEvent *re    = (XTestInputActionEvent *) reTemp;
 	xTestInputActionEvent *event = (xTestInputActionEvent *) eventTemp;
@@ -632,12 +632,12 @@
  *	that the specified key on the keyboard was moved as specified.
  */
 int
-XTestPressKey(display, device_id, delay, keycode, key_action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	keycode;
-unsigned int	key_action;
+XTestPressKey(
+Display		*display,
+int		device_id,
+unsigned long	delay,
+unsigned int	keycode,
+unsigned int	key_action)
 {
 	/*
 	 * bounds check the key code
@@ -664,12 +664,12 @@
  *	that the specified button on the mouse was moved as specified.
  */
 int
-XTestPressButton(display, device_id, delay, button_number, button_action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	button_number;
-unsigned int	button_action;
+XTestPressButton(
+Display		*display,
+int		device_id,
+unsigned long	delay,
+unsigned int	button_number,
+unsigned int	button_action)
 {
 	/*
 	 * bounds check the button number
@@ -696,12 +696,12 @@
  *	that the specified key/button was moved as specified.
  */
 static int
-XTestKeyOrButton(display, device_id, delay, code, action)
-Display		*display;
-int		device_id;
-unsigned long	delay;
-unsigned int	code;
-unsigned int	action;
+XTestKeyOrButton(
+Display		*display,
+int		device_id,
+unsigned long	delay,
+unsigned int	code,
+unsigned int	action)
 {
 	/*
 	 * holds a key input action to be filled out and sent to the server
@@ -877,13 +877,13 @@
  *	that the mouse was moved as specified.
  */
 int
-XTestMovePointer(display, device_id, delay, x, y, count)
-Display		*display;
-int		device_id;
-unsigned long	delay[];
-int		x[];
-int		y[];
-unsigned int	count;
+XTestMovePointer(
+Display		*display,
+int		device_id,
+unsigned long	delay[],
+int		x[],
+int		y[],
+unsigned int	count)
 {
 	/*
 	 * holds a motion input action to be filled out and sent to the server
@@ -1039,9 +1039,9 @@
  *	will fit in a normal input action, then send a delay input action.
  */
 static int
-XTestCheckDelay(display, delay_addr)
-Display		*display;
-unsigned long	*delay_addr;
+XTestCheckDelay(
+Display		*display,
+unsigned long	*delay_addr)
 {
 	/*
 	 * holds a delay input action to be filled out and sent to the server
@@ -1084,10 +1084,10 @@
  *	then send the input actions to the server using XTestFakeInput.
  */
 static int
-XTestPackInputAction(display, action_addr, action_size)
-Display	*display;
-CARD8	*action_addr;
-int	action_size;
+XTestPackInputAction(
+Display	*display,
+CARD8	*action_addr,
+int	action_size)
 {
 	/*
 	 * loop index
@@ -1184,11 +1184,11 @@
  *	Send input actions to the server.
  */
 static int
-XTestWriteInputActions(display, action_list_addr, action_list_size, ack_flag)
-Display	*display;
-char	*action_list_addr;
-int	action_list_size;
-int	ack_flag;
+XTestWriteInputActions(
+Display	*display,
+char	*action_list_addr,
+int	action_list_size,
+int	ack_flag)
 {
 	/*
 	 * Holds an event.  Used while waiting for an acknowledge event
@@ -1256,16 +1256,16 @@
  *	it is of XTestFakeAckType.
  */
 static	Bool
-XTestIdentifyMyEvent(display, event_ptr, args)
-Display	*display;
+XTestIdentifyMyEvent(
+Display	*display,
 /*
  * Holds the event that this routiine is supposed to look at.
  */
-XEvent	*event_ptr;
+XEvent	*event_ptr,
 /*
  * this points to any user-specified arguments (ignored)
  */
-char	*args;
+char	*args)
 {
 	/*
 	 * if the event if of the correct type, return the Bool True,
@@ -1288,8 +1288,7 @@
  *	Send any input actions in the input action buffer to the server.
  */
 int
-XTestFlush(display)
-Display	*display;
+XTestFlush(Display *display)
 {
 	/*
 	 * acknowledge flag