merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 8 insertions, 7 deletions

diff --git a/src/GCManager.c b/src/GCManager.c
index e80c758..5cd2b25 100644
--- a/src/GCManager.c
+++ b/src/GCManager.c
@@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/GCManager.c,v 1.6 2001/12/14 19:56:14 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
@@ -89,13 +90,13 @@ typedef struct _GCrec {
 		   GCClipXOrigin | GCClipYOrigin | GCDashOffset | \
 		   GCArcMode)
 
-static Bool Matches(dpy, ptr, valueMask, v, readOnlyMask, dynamicMask)
-    Display *dpy;
-    GCptr ptr;
-    register XtGCMask valueMask;
-    register XGCValues *v;
-    XtGCMask readOnlyMask;
-    XtGCMask dynamicMask;
+static Bool Matches(
+    Display *dpy,
+    GCptr ptr,
+    register XtGCMask valueMask,
+    register XGCValues *v,
+    XtGCMask readOnlyMask,
+    XtGCMask dynamicMask)
 {
     XGCValues gcv;
     register XtGCMask checkMask;