[xserver-commit] xserver/dix dixutils.c,3.17,3.18 main.c,3.43,3.44 tables.c,3.7,3.8

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/dix
In directory pdx:/tmp/cvs-serv1375/dix

Modified Files:
	dixutils.c main.c tables.c 
Log Message:
* completely get rid of NeedNestedPrototypes
* completely get rid of NeedVarargsPrototypes
* remove a lot of NeedFunctionPrototypes
* ansify many function declarations



Index: dixutils.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/dixutils.c,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -d -r3.17 -r3.18
--- a/dixutils.c	15 Jan 2004 09:03:46 -0000	3.17
+++ b/dixutils.c	18 Feb 2004 02:12:44 -0000	3.18
@@ -638,10 +638,8 @@
 #if NeedFunctionPrototypes
 QueueWorkProc (
     Bool	(*function)(
-#if NeedNestedPrototypes
 		ClientPtr	/* pClient */,
 		pointer		/* closure */
-#endif
 		),
     ClientPtr	client,
     pointer	closure)

Index: main.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/main.c,v
retrieving revision 3.43
retrieving revision 3.44
diff -u -d -r3.43 -r3.44
--- a/main.c	4 Feb 2004 15:56:07 -0000	3.43
+++ b/main.c	18 Feb 2004 02:12:44 -0000	3.44
@@ -154,11 +154,9 @@
 /*ARGSUSED*/
 void
 ReplyNotSwappd(
-#if NeedNestedPrototypes
 	ClientPtr pClient ,
 	int size ,
 	void * pbuf
-#endif
 	)
 {
     FatalError("Not implemented");
@@ -649,12 +647,10 @@
 #if NeedFunctionPrototypes
 AddScreen(
     Bool	(* pfnInit)(
-#if NeedNestedPrototypes
 	int /*index*/,
 	ScreenPtr /*pScreen*/,
 	int /*argc*/,
 	char ** /*argv*/
-#endif
 		),
     int argc,
     char **argv)

Index: tables.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/tables.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/tables.c	11 Sep 2003 05:12:50 -0000	3.7
+++ b/tables.c	18 Feb 2004 02:12:44 -0000	3.8
@@ -68,9 +68,7 @@
 #endif
 
 int (* InitialVector[3]) (
-#if NeedNestedPrototypes
 	ClientPtr /* client */
-#endif
     ) =
 {
     0,
@@ -79,9 +77,7 @@
 };
 
 int (* ProcVector[256]) (
-#if NeedNestedPrototypes
 	ClientPtr /* client */
-#endif
     ) =
 {
     ProcBadRequest,
@@ -215,9 +211,7 @@
 };
 
 int (* SwappedProcVector[256]) (
-#if NeedNestedPrototypes
 	ClientPtr /* client */
-#endif
     ) =
 {
     ProcBadRequest,