[xserver-commit] xserver/Xext bigreq.c,3.8,3.9 fontcache.c,1.7,1.8 mbuf.c,3.16,3.17 mitmisc.c,3.7,3.8 panoramiXSwap.c,3.10,3.11 saver.c,3.9,3.10 sleepuntil.c,3.9,3.10 sync.c,3.14,3.15 xcmisc.c,3.9,3.10 xf86bigfont.c,1.15,1.16 xf86misc.c,3.40,3.41 xf86vmode.c,3.57,3.58 xtest.c,3.11,3.12 xtest1dd.c,3.7,3.8 xtest1dd.h,3.3,3.4 xtest1di.c,3.6,3.7

Warren Turkal xserver-commit@pdx.freedesktop.org 

Committed by: wt

Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv15213/Xext

Modified Files:
	bigreq.c fontcache.c mbuf.c mitmisc.c panoramiXSwap.c saver.c 
	sleepuntil.c sync.c xcmisc.c xf86bigfont.c xf86misc.c 
	xf86vmode.c xtest.c xtest1dd.c xtest1dd.h xtest1di.c 
Log Message:
* completely get rid of NeedNestedPrototypes
* completely get rid of NeedVarargsPrototypes
* remove a lot of NeedFunctionPrototypes
* ansify many function declarations



Index: bigreq.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/bigreq.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/bigreq.c	2 Nov 2003 19:56:10 -0000	3.8
+++ b/bigreq.c	18 Feb 2004 03:23:35 -0000	3.9
@@ -44,9 +44,7 @@
 static unsigned char XBigReqCode;
 
 static void BigReqResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcBigReqDispatch);

Index: fontcache.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/fontcache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/fontcache.c	11 Sep 2003 05:12:50 -0000	1.7
+++ b/fontcache.c	18 Feb 2004 03:23:35 -0000	1.8
@@ -54,9 +54,7 @@
 static int miscErrorBase;
 
 static void FontCacheResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry* /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcFontCacheDispatch);

Index: mbuf.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/mbuf.c,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -d -r3.16 -r3.17
--- a/mbuf.c	11 Sep 2003 05:12:50 -0000	3.16
+++ b/mbuf.c	18 Feb 2004 03:23:35 -0000	3.17
@@ -71,43 +71,31 @@
 int			MultibufferWindowIndex = -1;
 
 static void		PerformDisplayRequest (
-#if NeedFunctionPrototypes
 				MultibuffersPtr * /* ppMultibuffers */,
 				MultibufferPtr * /* pMultibuffer */,
 				int /* nbuf */
-#endif
 				);
 static Bool		QueueDisplayRequest (
-#if NeedFunctionPrototypes
 				ClientPtr /* client */,
 				TimeStamp /* activateTime */
-#endif
 				);
 
 static void		BumpTimeStamp (
-#if NeedFunctionPrototypes
 				TimeStamp * /* ts */,
 				CARD32 /* inc */
-#endif
 				);
 
 static void		AliasMultibuffer (
-#if NeedFunctionPrototypes
 				MultibuffersPtr /* pMultibuffers */,
 				int /* i */
-#endif
 				);
 static void		RecalculateMultibufferOtherEvents (
-#if NeedFunctionPrototypes
 				MultibufferPtr /* pMultibuffer */
-#endif
 				);
 static int		EventSelectForMultibuffer(
-#if NeedFunctionPrototypes
 				MultibufferPtr /* pMultibuffer */,
 				ClientPtr /* client */,
 				Mask /* mask */
-#endif
 				);
 
 /*
@@ -116,10 +104,8 @@
  */
 RESTYPE			MultibufferDrawableResType;
 static int		MultibufferDrawableDelete (
-#if NeedFunctionPrototypes
 				pointer /* value */,
 				XID /* id */
-#endif
 				);
 /*
  * The per-buffer data can be found as a resource with this type.
@@ -128,10 +114,8 @@
  */
 static RESTYPE		MultibufferResType;
 static int		MultibufferDelete (
-#if NeedFunctionPrototypes
 				pointer /* value */,
 				XID /* id */
-#endif
 				);
 
 /*
@@ -140,10 +124,8 @@
  */
 static RESTYPE		MultibuffersResType;
 static int		MultibuffersDelete (
-#if NeedFunctionPrototypes
 				pointer /* value */,
 				XID /* id */
-#endif
 				);
 
 /*
@@ -152,10 +134,8 @@
  */
 static RESTYPE		OtherClientResType;
 static int		OtherClientDelete (
-#if NeedFunctionPrototypes
 				pointer /* value */,
 				XID /* id */
-#endif
 				);
 
 /****************
@@ -190,44 +170,32 @@
 static DISPATCH_PROC(SProcSetMBufferAttributes);
 
 static void		MultibufferResetProc(
-#if NeedFunctionPrototypes
 				ExtensionEntry * /* extEntry */
-#endif
 				);
 static void		SClobberNotifyEvent(
-#if NeedFunctionPrototypes
 				xMbufClobberNotifyEvent * /* from */,
 				xMbufClobberNotifyEvent	* /* to */
-# endif
 				);
 static void		SUpdateNotifyEvent(
-#if NeedFunctionPrototypes
 				xMbufUpdateNotifyEvent * /* from */,
 				xMbufUpdateNotifyEvent * /* to */
-#endif
 				);
 static Bool		MultibufferPositionWindow(
-#if NeedFunctionPrototypes
 				WindowPtr /* pWin */,
 				int /* x */,
 				int /* y */
-#endif
 				);
 
 static void		SetupBackgroundPainter (
-#if NeedFunctionPrototypes
 				WindowPtr /* pWin */,
 				GCPtr /* pGC */
-#endif
 				);
 
 static int		DeliverEventsToMultibuffer (
-#if NeedFunctionPrototypes
 				MultibufferPtr /* pMultibuffer */,
 				xEvent * /* pEvents */,
 				int /* count */,
 				Mask /* filter */
-#endif
 				);
 
 void

Index: mitmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/mitmisc.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/mitmisc.c	2 Nov 2003 19:56:10 -0000	3.7
+++ b/mitmisc.c	18 Feb 2004 03:23:35 -0000	3.8
@@ -48,9 +48,7 @@
 static unsigned char MITReqCode;
 
 static void MITResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcMITDispatch);

Index: panoramiXSwap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/panoramiXSwap.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/panoramiXSwap.c	11 Sep 2003 05:12:50 -0000	3.10
+++ b/panoramiXSwap.c	18 Feb 2004 03:23:35 -0000	3.11
@@ -59,11 +59,7 @@
 extern char *ConnectionInfo;
 extern int connBlockScreenStart;
 
-#if NeedFunctionPrototypes
-#define PROC_EXTERN(pfunc)      extern int pfunc(ClientPtr)
-#else
-#define PROC_EXTERN(pfunc)      extern int pfunc()
-#endif     
+#define PROC_EXTERN(pfunc)      extern int pfunc(ClientPtr /* client */)
 
 PROC_EXTERN(ProcPanoramiXQueryVersion);
 PROC_EXTERN(ProcPanoramiXGetState);

Index: saver.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/saver.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- a/saver.c	2 Nov 2003 19:56:10 -0000	3.9
+++ b/saver.c	18 Feb 2004 03:23:35 -0000	3.10
@@ -78,52 +78,38 @@
 static DISPATCH_PROC(SProcScreenSaverUnsetAttributes);
 
 static Bool ScreenSaverHandle (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */,
 	int /* xstate */,
 	Bool /* force */
-#endif
 	);
 
 static Bool
 CreateSaverWindow (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */
-#endif
 	);
 
 static Bool
 DestroySaverWindow (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */
-#endif
 	);
 
 static void
 UninstallSaverColormap (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */
-#endif
 	);
 
 static void
 CheckScreenPrivate (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */
-#endif
 	);
 
 static void SScreenSaverNotifyEvent (
-#if NeedFunctionPrototypes
 	xScreenSaverNotifyEvent * /* from */,
 	xScreenSaverNotifyEvent * /* to */
-#endif
 	);
 
 static void ScreenSaverResetProc (
-#if NeedFunctionPrototypes
 	ExtensionEntry * /* extEntry */
-#endif
 	);
 
 /*
@@ -147,25 +133,19 @@
 } ScreenSaverEventRec;
 
 static int ScreenSaverFreeEvents(
-#if NeedFunctionPrototypes
     pointer /* value */,
     XID /* id */
-#endif
 );
 
 static Bool setEventMask (
-#if NeedFunctionPrototypes
     ScreenPtr /* pScreen */,
     ClientPtr /* client */,
     unsigned long /* mask */
-#endif
 );
 
 static unsigned long getEventMask (
-#if NeedFunctionPrototypes
     ScreenPtr /* pScreen */,
     ClientPtr /* client */
-#endif
 );
 
 /*
@@ -193,31 +173,23 @@
 } ScreenSaverAttrRec, *ScreenSaverAttrPtr;
 
 static int ScreenSaverFreeAttr (
-#if NeedFunctionPrototypes
     pointer /* value */,
     XID /* id */
-#endif
 );
 
 static void FreeAttrs (
-#if NeedFunctionPrototypes
     ScreenSaverAttrPtr	/* pAttr */
-#endif
 );
 
 static void FreeScreenAttr (
-#if NeedFunctionPrototypes
     ScreenSaverAttrPtr	/* pAttr */
-#endif
 );
 
 static void
 SendScreenSaverNotify (
-#if NeedFunctionPrototypes
     ScreenPtr /* pScreen */,
     int /* state */,
     Bool /* forced */
-#endif
 );
 
 typedef struct _ScreenSaverScreenPrivate {
@@ -229,9 +201,7 @@
 
 static ScreenSaverScreenPrivatePtr
 MakeScreenPrivate (
-#if NeedFunctionPrototypes
 	ScreenPtr /* pScreen */
-#endif
 	);
 
 static int ScreenPrivateIndex;

Index: sleepuntil.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sleepuntil.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- a/sleepuntil.c	18 Feb 2004 02:12:44 -0000	3.9
+++ b/sleepuntil.c	18 Feb 2004 03:23:35 -0000	3.10
@@ -60,30 +60,22 @@
 static int	    SertafiedGeneration;
 
 static void	    ClientAwaken(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     pointer /* closure */
-#endif
 );
 static int	    SertafiedDelete(
-#if NeedFunctionPrototypes
     pointer /* value */,
     XID /* id */
-#endif
 );
 static void	    SertafiedBlockHandler(
-#if NeedFunctionPrototypes
     pointer /* data */,
     OSTimePtr /* wt */,
     pointer /* LastSelectMask */
-#endif
 );
 static void	    SertafiedWakeupHandler(
-#if NeedFunctionPrototypes
     pointer /* data */,
     int /* i */,
     pointer /* LastSelectMask */
-#endif
 );
 
 int

Index: sync.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/sync.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- a/sync.c	2 Nov 2003 19:56:10 -0000	3.14
+++ b/sync.c	18 Feb 2004 03:23:35 -0000	3.15
@@ -103,219 +103,163 @@
 
 static int
 FreeAlarm(
-#if NeedFunctionPrototypes
     pointer /* addr */,
     XID /* id */
-#endif
 );
 
 static int
 FreeAlarmClient(
-#if NeedFunctionPrototypes
     pointer /* value */,
     XID /* id */
-#endif
 );
 
 static int
 FreeAwait(
-#if NeedFunctionPrototypes
     pointer /* addr */,
     XID /* id */
-#endif
 );
 
 static void
 ServertimeBracketValues(
-#if NeedFunctionPrototypes
     pointer /* pCounter */,
     CARD64 * /* pbracket_less */,
     CARD64 * /* pbracket_greater */
-#endif
 );
 
 static void
 ServertimeQueryValue(
-#if NeedFunctionPrototypes
     pointer /* pCounter */,
     CARD64 * /* pValue_return */
-#endif
 );
 
 static void
 ServertimeWakeupHandler(
-#if NeedFunctionPrototypes
     pointer /* env */,
     int /* rc */,
     pointer /* LastSelectMask */
-#endif
 );
 
-static int 
+static int
 SyncInitTrigger(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     SyncTrigger * /* pTrigger */,
     XSyncCounter /* counter */,
     Mask /* changes */
-#endif
 );
 
 static void
 SAlarmNotifyEvent(
-#if NeedFunctionPrototypes
     xSyncAlarmNotifyEvent * /* from */,
     xSyncAlarmNotifyEvent * /* to */
-#endif
 );
 
 static void
 SCounterNotifyEvent(
-#if NeedFunctionPrototypes
     xSyncCounterNotifyEvent * /* from */,
     xSyncCounterNotifyEvent * /* to */
-#endif
 );
 
 static void
 ServertimeBlockHandler(
-#if NeedFunctionPrototypes
     pointer  /* env */,
     struct timeval ** /* wt */,
     pointer  /* LastSelectMask */
-#endif
 );
 
 static int
 SyncAddTriggerToCounter(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */
-#endif
 );
 
 extern void
 SyncAlarmCounterDestroyed(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */
-#endif
 );
 
 static void
 SyncAlarmTriggerFired(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */
-#endif
 );
 
 static void
 SyncAwaitTriggerFired(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */
-#endif
 );
 
 static int
 SyncChangeAlarmAttributes(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     SyncAlarm * /* pAlarm */,
     Mask /* mask */,
     CARD32 * /* values */
-#endif
 );
 
 static Bool
 SyncCheckTriggerNegativeComparison(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */,
     CARD64 /* oldval */
-#endif
 );
 
 static Bool
 SyncCheckTriggerNegativeTransition(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */,
     CARD64 /* oldval */
-#endif
 );
 
 static Bool
 SyncCheckTriggerPositiveComparison(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */,
     CARD64 /* oldval */
-#endif
 );
 
 static Bool
 SyncCheckTriggerPositiveTransition(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */,
     CARD64 /* oldval */
-#endif
 );
 
 static SyncCounter *
 SyncCreateCounter(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     XSyncCounter /* id */,
     CARD64 /* initialvalue */
-#endif
 );
 
 static void SyncComputeBracketValues(
-#if NeedFunctionPrototypes
     SyncCounter * /* pCounter */,
     Bool /* startOver */
-#endif
 );
 
 static void
 SyncDeleteTriggerFromCounter(
-#if NeedFunctionPrototypes
     SyncTrigger * /* pTrigger */
-#endif
 );
 
 static Bool
 SyncEventSelectForAlarm(
-#if NeedFunctionPrototypes
     SyncAlarm * /* pAlarm */,
     ClientPtr /* client */,
     Bool /* wantevents */
-#endif
 );
 
 static void
-SyncInitServerTime(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
+SyncInitServerTime(void);
 
 static void 
 SyncResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 
 static void
 SyncSendAlarmNotifyEvents(
-#if NeedFunctionPrototypes
     SyncAlarm * /* pAlarm */
-#endif
 );
 
 static void
 SyncSendCounterNotifyEvents(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     SyncAwait ** /* ppAwait */,
     int /* num_events */
-#endif
 );
 
 static DISPATCH_PROC(ProcSyncAwait);
@@ -1086,10 +1030,8 @@
 }
 
 static int FreeCounter(
-#if NeedFunctionPrototypes
     pointer /*env*/,
     XID     /*id*/
-#endif
 );
 
 /*

Index: xcmisc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xcmisc.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- a/xcmisc.c	2 Nov 2003 19:56:10 -0000	3.9
+++ b/xcmisc.c	18 Feb 2004 03:23:35 -0000	3.10
@@ -46,9 +46,7 @@
 static unsigned char XCMiscCode;
 
 static void XCMiscResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcXCMiscDispatch);

Index: xf86bigfont.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xf86bigfont.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86bigfont.c	11 Sep 2003 05:12:50 -0000	1.15
+++ b/xf86bigfont.c	18 Feb 2004 03:23:35 -0000	1.16
@@ -76,9 +76,7 @@
 #include "xf86bigfstr.h"
 
 static void XF86BigfontResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry *	/* extEntry */
-#endif
     );
 
 static DISPATCH_PROC(ProcXF86BigfontDispatch);

Index: xf86misc.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xf86misc.c,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -d -r3.40 -r3.41
--- a/xf86misc.c	11 Sep 2003 05:12:50 -0000	3.40
+++ b/xf86misc.c	18 Feb 2004 03:23:35 -0000	3.41
@@ -57,9 +57,7 @@
 #define MPRIV(c) ((c)->devPrivates[MiscClientPrivateIndex].ptr)
 
 static void XF86MiscResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry* /* extEntry */
-#endif
 );
 
 static void

Index: xf86vmode.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xf86vmode.c,v
retrieving revision 3.57
retrieving revision 3.58
diff -u -d -r3.57 -r3.58
--- a/xf86vmode.c	11 Sep 2003 05:12:50 -0000	3.57
+++ b/xf86vmode.c	18 Feb 2004 03:23:35 -0000	3.58
@@ -67,9 +67,7 @@
 #define VMPRIV(c) ((c)->devPrivates[VidModeClientPrivateIndex].ptr)
 
 static void XF86VidModeResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry* /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcXF86VidModeDispatch);

Index: xtest.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- a/xtest.c	15 Feb 2004 14:33:52 -0000	3.11
+++ b/xtest.c	18 Feb 2004 03:23:35 -0000	3.12
@@ -64,15 +64,11 @@
 #endif /* XINPUT */
 
 static void XTestResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 static int XTestSwapFakeInput(
-#if NeedFunctionPrototypes
     ClientPtr /* client */,
     xReq * /* req */
-#endif
 );
 
 static DISPATCH_PROC(ProcXTestCompareCursor);

Index: xtest1dd.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest1dd.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/xtest1dd.c	11 Sep 2003 05:12:50 -0000	3.7
+++ b/xtest1dd.c	18 Feb 2004 03:23:35 -0000	3.8
@@ -43,8 +43,8 @@
 advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
 
-Hewlett-Packard makes no representations about the 
-suitability of this software for any purpose.  It is provided 
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.
 
 This software is not subject to any license of the American
@@ -116,7 +116,7 @@
 	 * holds the action type, one of: XTestDELAY_ACTION,
 	 * XTestKEY_ACTION, XTestMOTION_ACTION, XTestJUMP_ACTION
 	 */
-	CARD8	type;	
+	CARD8	type;
 	/*
 	 * holds the device type, in the range 0 to 15
 	 */
@@ -161,7 +161,7 @@
  */
 static int 			packet_index;
 /*
- * set to 1 when the input action event is full and needs to be sent to the 
+ * set to 1 when the input action event is full and needs to be sent to the
  * client
  */
 static int			input_action_event_full = 0;
@@ -192,7 +192,7 @@
  */
 static short			pmousey;
 /*
- * The playback_on flag is set to 1 while there are input actions in the 
+ * The playback_on flag is set to 1 while there are input actions in the
  * input action array.  It is set to 0 when the server has received all of
  * the user actions.
  */
@@ -229,7 +229,7 @@
  */
 static int			time_saved = 0;
 /*
- * holds the extension's notion of what the current time is while it is 
+ * holds the extension's notion of what the current time is while it is
  * sending input actions to a client
  */
 static struct timeval		current_time;
@@ -291,60 +291,38 @@
  ***************************************************************/
 
 static void	parse_key_fake(
-#if NeedFunctionPrototypes
 			XTestKeyInfo	* /* fkey */
-#endif
 			);
 static void	parse_motion_fake(
-#if NeedFunctionPrototypes
 			XTestMotionInfo	* /* fmotion */
-#endif
 			);
 static void	parse_jump_fake(
-#if NeedFunctionPrototypes
 			XTestJumpInfo	* /* fjump */
-#endif
 			);
 static void	parse_delay_fake(
-#if NeedFunctionPrototypes
 			XTestDelayInfo	* /* tevent */
-#endif
 			);
 static void	send_ack(
-#if NeedFunctionPrototypes
 			ClientPtr	 /* client */
-#endif
 			);
 static void	start_play_clock(
-#if NeedFunctionPrototypes
 			void
-#endif
 			);
 static void	compute_action_time(
-#if NeedFunctionPrototypes
 			struct timeval	* /* rtime */
-#endif
 			);
 static int	find_residual_time(
-#if NeedFunctionPrototypes
 			struct timeval	* /* rtime */
-#endif
 			);
 
 static CARD16	check_time_event(
-#if NeedFunctionPrototypes
 			void
-#endif
 			);
 static CARD32	current_ms(
-#if NeedFunctionPrototypes
 			struct timeval	* /* otime */
-#endif
 			);
 static int	there_is_room(
-#if NeedFunctionPrototypes
 			int	/* actsize */
-#endif
 			);
 
 /******************************************************************************

Index: xtest1dd.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest1dd.h,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- a/xtest1dd.h	11 Sep 2003 05:12:50 -0000	3.3
+++ b/xtest1dd.h	18 Feb 2004 03:23:35 -0000	3.4
@@ -34,118 +34,84 @@
 extern	ClientPtr	playback_client;
 extern	KeyCode		xtest_command_key;
 
-extern void stop_stealing_input(
-#if NeedFunctionPrototypes
-	void
-#endif
-);
+extern void stop_stealing_input(void);
 
 extern void
 steal_input(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	CARD32                 /* mode */
-#endif
 );
 
 extern void
-flush_input_actions(
-#if NeedFunctionPrototypes
-	void
-#endif
-);
+flush_input_actions(void);
 
 extern void
 XTestStealJumpData(
-#if NeedFunctionPrototypes
 	int                    /* jx */,
 	int                    /* jy */,
 	int                    /* dev_type */
-#endif
 );
 
 extern void
 XTestStealMotionData(
-#if NeedFunctionPrototypes
 	int                    /* dx */,
 	int                    /* dy */,
 	int                    /* dev_type */,
 	int                    /* mx */,
 	int                    /* my */
-#endif
 );
 
 extern Bool
 XTestStealKeyData(
-#if NeedFunctionPrototypes
 	unsigned               /* keycode */,
 	int                    /* keystate */,
 	int                    /* dev_type */,
 	int                    /* locx */,
 	int                    /* locy */
-#endif
 );
 
 extern void
 parse_fake_input(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	char *                 /* req */
-#endif
 );
 
 extern void
 XTestComputeWaitTime(
-#if NeedFunctionPrototypes
 	struct timeval *       /* waittime */
-#endif
 );
 
 extern int
 XTestProcessInputAction(
-#if NeedFunctionPrototypes
 	int                    /* readable */,
 	struct timeval *       /* waittime */
-#endif
 );
 
 extern void
-abort_play_back(
-#if NeedFunctionPrototypes
-	void
-#endif
-);
+abort_play_back(void);
 
 extern void
 return_input_array_size(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 );
 
 extern void XTestGenerateEvent(
-#if NeedFunctionPrototypes
 	int                    /* dev_type */,
 	int                    /* keycode */,
 	int                    /* keystate */,
 	int                    /* mousex */,
 	int                    /* mousey */
-#endif
 );
 
 extern void XTestGetPointerPos(
-#if NeedFunctionPrototypes
 	short *                /* fmousex */,
 	short *                /* fmousey */
-#endif
 );
 
 extern void XTestJumpPointer(
-#if NeedFunctionPrototypes
 	int                    /* jx */,
 	int                    /* jy */,
 	int                    /* dev_type */
-#endif
 );
 
 #endif /* XTEST1DD_H */

Index: xtest1di.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/xtest1di.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- a/xtest1di.c	2 Nov 2003 19:56:10 -0000	3.6
+++ b/xtest1di.c	18 Feb 2004 03:23:35 -0000	3.7
@@ -43,8 +43,8 @@
 advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
 
-Hewlett-Packard makes no representations about the 
-suitability of this software for any purpose.  It is provided 
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.
 
 This software is not subject to any license of the American
@@ -69,7 +69,7 @@
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
-#include "gcstruct.h"   
+#include "gcstruct.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "opaque.h"
@@ -154,29 +154,21 @@
 static DISPATCH_PROC(SProcTestQueryInputSize);
 
 static void	XTestResetProc(
-#if NeedFunctionPrototypes
 	ExtensionEntry *	/* unused */
-#endif
 	);
 static void	SReplyXTestDispatch(
-#if NeedFunctionPrototypes
 	ClientPtr		/* client_ptr */,
 	int			/* size */,
 	char *			/* reply_ptr */
-#endif
 	);
 static void	SEventXTestDispatch(
-#if NeedFunctionPrototypes
 	xEvent *		/* from */,
 	xEvent *		/* to */
-#endif
 	);
 
 static int	XTestCurrentClientGone(
-#if NeedFunctionPrototypes
 	pointer			/* value */,
 	XID			/* id */
-#endif
 	);
 
 /*****************************************************************************