merge latest (4.3.99.16) from XFree86 (vendor) branch

hw/xnest/Args.c

@@ -12,6 +12,8 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+
 #include "X.h"
 #include "Xproto.h"
 #include "screenint.h"
@@ -45,10 +47,8 @@ int xnestNumScreens = 0;
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 
-int ddxProcessArgument (argc, argv, i)
-    int	argc;
-    char *argv[] ;
-    int	i;
+int
+ddxProcessArgument (int argc, char *argv[], int i)
 {
   if (!strcmp(argv[i], "-display")) {
     if (++i < argc) {