XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 17 insertions, 73 deletions

diff --git a/include/dixstruct.h b/include/dixstruct.h
index bcf29dc04..43920540f 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.18 2003/01/12 02:44:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -51,20 +51,14 @@ typedef struct {
 } NewClientInfoRec;
 
 typedef void (*ReplySwapPtr) (
-#if NeedNestedPrototypes
 		ClientPtr	/* pClient */,
 		int		/* size */,
-		void *		/* pbuf */
-#endif
-);
+		void *		/* pbuf */);
 
 extern void ReplyNotSwappd (
-#if NeedNestedPrototypes
 		ClientPtr	/* pClient */,
 		int		/* size */,
-		void *		/* pbuf */
-#endif
-);
+		void *		/* pbuf */);
 
 typedef enum {ClientStateInitial,
 	      ClientStateAuthenticating,
@@ -95,10 +89,7 @@ typedef struct _Client {
     int         numSaved;
     pointer     screenPrivate[MAXSCREENS];
     int         (**requestVector) (
-#if NeedNestedPrototypes
-		ClientPtr /* pClient */
-#endif
-);
+		ClientPtr /* pClient */);
     CARD32	req_len;		/* length of current request */
     Bool	big_requests;		/* supports large requests */
     int		priority;
@@ -117,35 +108,25 @@ typedef struct _Client {
     int         requestLogIndex;
 #endif
 #ifdef LBX
-    int		(*readRequest)(
-#if NeedNestedPrototypes
-	ClientPtr /*client*/
-#endif
-);
+    int		(*readRequest)(ClientPtr /*client*/);
 #endif
     unsigned long replyBytesRemaining;
 #ifdef XCSECURITY
     XID		authId;
     unsigned int trustLevel;
     pointer (* CheckAccess)(
-#if NeedNestedPrototypes
 	    ClientPtr /*pClient*/,
 	    XID /*id*/,
 	    RESTYPE /*classes*/,
 	    Mask /*access_mode*/,
-	    pointer /*resourceval*/
-#endif
-);
+	    pointer /*resourceval*/);
 #endif
 #ifdef XAPPGROUP
     struct _AppGroupRec*	appgroup;
 #endif
     struct _FontResolution * (*fontResFunc) (    /* no need for font.h */
-#if NeedNestedPrototypes
 		ClientPtr	/* pClient */,
-		int *		/* num */
-#endif
-);
+		int *		/* num */);
 #ifdef SMART_SCHEDULE
     int	    smart_priority;
     long    smart_start_tick;
@@ -167,31 +148,21 @@ extern Bool SmartScheduleDisable;
 extern Bool SmartScheduleIdle;
 extern Bool SmartScheduleTimerStopped;
 extern Bool SmartScheduleStartTimer(void);
-#define SMART_MAX_PRIORITY  20
-#define SMART_MIN_PRIORITY  -20
+#define SMART_MAX_PRIORITY  (20)
+#define SMART_MIN_PRIORITY  (-20)
 
-extern Bool SmartScheduleInit(
-#ifdef NeedFunctionPrototypes
-    void
-#endif
-);
+extern Bool SmartScheduleInit(void);
 
 #endif
 
 /* This prototype is used pervasively in Xext, dix */
-#if NeedFunctionPrototypes
 #define DISPATCH_PROC(func) int func(ClientPtr /* client */)
-#else
-#define DISPATCH_PROC(func) int func(/* ClientPtr client */)
-#endif
 
 typedef struct _WorkQueue {
     struct _WorkQueue *next;
     Bool        (*function) (
-#if NeedNestedPrototypes
 		ClientPtr	/* pClient */,
 		pointer		/* closure */
-#endif
 );
     ClientPtr   client;
     pointer     closure;
@@ -201,17 +172,10 @@ extern TimeStamp currentTime;
 extern TimeStamp lastDeviceEventTime;
 
 extern int CompareTimeStamps(
-#if NeedFunctionPrototypes
     TimeStamp /*a*/,
-    TimeStamp /*b*/
-#endif
-);
+    TimeStamp /*b*/);
 
-extern TimeStamp ClientTimeToServerTime(
-#if NeedFunctionPrototypes
-    CARD32 /*c*/
-#endif
-);
+extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
 
 typedef struct _CallbackRec {
   CallbackProcPtr proc;
@@ -230,38 +194,18 @@ typedef struct _CallbackList {
 
 /* proc vectors */
 
-extern int (* InitialVector[3]) (
-#if NeedNestedPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern int (* InitialVector[3]) (ClientPtr /*client*/);
 
-extern int (* ProcVector[256]) (
-#if NeedNestedPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern int (* ProcVector[256]) (ClientPtr /*client*/);
 
-extern int (* SwappedProcVector[256]) (
-#if NeedNestedPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
 
 #ifdef K5AUTH
-extern int (*k5_Vector[256])() =
-#if NeedNestedPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern int (*k5_Vector[256])(ClientPtr /*client*/);
 #endif
 
 extern ReplySwapPtr ReplySwapVector[256];
 
-extern int ProcBadRequest(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern int ProcBadRequest(ClientPtr /*client*/);
 
 #endif				/* DIXSTRUCT_H */