Merging XORG-CURRENT into trunk

dix/xpstubs.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */
+/* $XFree86$ */
 /*
 Copyright 1996, 1998  The Open Group
 
@@ -31,24 +31,24 @@ from The Open Group.
 #include "font.h"
 
 Bool
-XpClientIsBitmapClient(client)
-    ClientPtr client;
+XpClientIsBitmapClient(
+    ClientPtr client)
 {
     return TRUE;
 }
 
 Bool
-XpClientIsPrintClient(client, fpe)
-    ClientPtr client;
-    FontPathElementPtr fpe;
+XpClientIsPrintClient(
+    ClientPtr client,
+    FontPathElementPtr fpe)
 {
     return FALSE;
 }
 int
-XprintOptions(argc, argv, i)
-    int argc;
-    char **argv;
-    int i;
+XprintOptions(
+    int argc,
+    char **argv,
+    int i)
 {
     return i;
 }