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

1 files changed, 0 insertions, 114 deletions

diff --git a/include/X11/SM/SMlib.h b/include/X11/SM/SMlib.h
index 8ec7ea2..92418c1 100644
--- a/include/X11/SM/SMlib.h
+++ b/include/X11/SM/SMlib.h
@@ -87,58 +87,44 @@ typedef enum {
  */
 
 typedef void (*SmcSaveYourselfProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */,
     int  		/* saveType */,
     Bool		/* shutdown */,
     int			/* interactStyle */,
     Bool		/* fast */
-#endif
 );
 
 typedef void (*SmcSaveYourselfPhase2Proc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */
-#endif
 );
 
 typedef void (*SmcInteractProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */
-#endif
 );
 
 typedef void (*SmcDieProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */
-#endif
 );
 
 typedef void (*SmcShutdownCancelledProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */
-#endif
 );
 
 typedef void (*SmcSaveCompleteProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */
-#endif
 );
 
 typedef void (*SmcPropReplyProc) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmPointer		/* clientData */,
     int			/* numProps */,
     SmProp **		/* props */
-#endif
 );
 
 
@@ -182,31 +168,24 @@ typedef struct {
  */
 
 typedef Status (*SmsRegisterClientProc) (
-#if NeedFunctionPrototypes
     SmsConn 		/* smsConn */,
     SmPointer		/* managerData */,
     char *		/* previousId */				     
-#endif
 );
 
 typedef void (*SmsInteractRequestProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     int			/* dialogType */
-#endif
 );
 
 typedef void (*SmsInteractDoneProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     Bool		/* cancelShutdown */
-#endif
 );
 
 typedef void (*SmsSaveYourselfRequestProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     int  		/* saveType */,
@@ -214,56 +193,43 @@ typedef void (*SmsSaveYourselfRequestProc) (
     int			/* interactStyle */,
     Bool		/* fast */,
     Bool		/* global */
-#endif
 );
 
 typedef void (*SmsSaveYourselfPhase2RequestProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */
-#endif
 );
 
 typedef void (*SmsSaveYourselfDoneProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     Bool		/* success */
-#endif
 );
 
 typedef void (*SmsCloseConnectionProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     int			/* count */,
     char **		/* reasonMsgs */
-#endif
 );
 
 typedef void (*SmsSetPropertiesProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     int			/* numProps */,
     SmProp **		/* props */
-#endif
 );
 
 typedef void (*SmsDeletePropertiesProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */,
     int			/* numProps */,
     char **		/* propNames */
-#endif
 );
 
 typedef void (*SmsGetPropertiesProc) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     SmPointer		/* managerData */
-#endif
 );
 
 
@@ -340,13 +306,11 @@ typedef struct {
 
 
 typedef Status (*SmsNewClientProc) (
-#if NeedFunctionPrototypes
     SmsConn 		/* smsConn */,
     SmPointer		/* managerData */,
     unsigned long *	/* maskRet */,
     SmsCallbacks *	/* callbacksRet */,
     char **		/* failureReasonRet */
-#endif
 );
 
 
@@ -356,7 +320,6 @@ typedef Status (*SmsNewClientProc) (
  */
 
 typedef void (*SmcErrorHandler) (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     Bool		/* swap */,
     int			/* offendingMinorOpcode */,
@@ -364,11 +327,9 @@ typedef void (*SmcErrorHandler) (
     int 		/* errorClass */,
     int			/* severity */,
     SmPointer		/* values */
-#endif
 );
 
 typedef void (*SmsErrorHandler) (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     Bool		/* swap */,
     int			/* offendingMinorOpcode */,
@@ -376,7 +337,6 @@ typedef void (*SmsErrorHandler) (
     int 		/* errorClass */,
     int			/* severity */,
     SmPointer		/* values */
-#endif
 );
 
 
@@ -388,7 +348,6 @@ typedef void (*SmsErrorHandler) (
 _XFUNCPROTOBEGIN
 
 extern SmcConn SmcOpenConnection (
-#if NeedFunctionPrototypes
     char *		/* networkIdsList */,
     SmPointer		/* context */,
     int			/* xsmpMajorRev */,
@@ -399,129 +358,95 @@ extern SmcConn SmcOpenConnection (
     char **		/* clientIdRet */,
     int			/* errorLength */,
     char *		/* errorStringRet */
-#endif
 );
 
 extern SmcCloseStatus SmcCloseConnection (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     int			/* count */,
     char **		/* reasonMsgs */
-#endif
 );
 
 extern void SmcModifyCallbacks (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     unsigned long	/* mask */,
     SmcCallbacks *	/* callbacks */
-#endif
 );
 
 extern void SmcSetProperties (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     int      	        /* numProps */,
     SmProp **		/* props */
-#endif
 );
 
 extern void SmcDeleteProperties (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     int      	        /* numProps */,
     char **		/* propNames */
-#endif
 );
 
 extern Status SmcGetProperties (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     SmcPropReplyProc	/* propReplyProc */,
     SmPointer		/* clientData */
-#endif
 );
 
 extern Status SmcInteractRequest (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     int			/* dialogType */,
     SmcInteractProc	/* interactProc */,
     SmPointer		/* clientData */
-#endif
 );
 
 extern void SmcInteractDone (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     Bool 		/* cancelShutdown */
-#endif
 );
 
 extern void SmcRequestSaveYourself (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     int			/* saveType */,
     Bool 		/* shutdown */,
     int			/* interactStyle */,
     Bool		/* fast */,
     Bool		/* global */
-#endif
 );
 
 extern Status SmcRequestSaveYourselfPhase2 (
-#if NeedFunctionPrototypes
     SmcConn			/* smcConn */,
     SmcSaveYourselfPhase2Proc	/* saveYourselfPhase2Proc */,
     SmPointer			/* clientData */
-#endif
 );
 
 extern void SmcSaveYourselfDone (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */,
     Bool		/* success */
-#endif
 );
 
 extern int SmcProtocolVersion (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern int SmcProtocolRevision (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern char *SmcVendor (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern char *SmcRelease (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern char *SmcClientID (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern IceConn SmcGetIceConnection (
-#if NeedFunctionPrototypes
     SmcConn		/* smcConn */
-#endif
 );
 
 extern Status SmsInitialize (
-#if NeedFunctionPrototypes
     char *			/* vendor */,
     char *			/* release */,
     SmsNewClientProc		/* newClientProc */,
@@ -529,129 +454,90 @@ extern Status SmsInitialize (
     IceHostBasedAuthProc	/* hostBasedAuthProc */,
     int				/* errorLength */,
     char *			/* errorStringRet */
-#endif
 );
 
 extern char *SmsClientHostName (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern char *SmsGenerateClientID (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern Status SmsRegisterClientReply (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     char *		/* clientId */
-#endif
 );
 
 extern void SmsSaveYourself (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     int			/* saveType */,
     Bool 		/* shutdown */,
     int			/* interactStyle */,
     Bool		/* fast */
-#endif
 );
 
 extern void SmsSaveYourselfPhase2 (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern void SmsInteract (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern void SmsDie (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern void SmsSaveComplete (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern void SmsShutdownCancelled (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern void SmsReturnProperties (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */,
     int			/* numProps */,
     SmProp **		/* props */
-#endif
 );
 
 extern void SmsCleanUp (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern int SmsProtocolVersion (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern int SmsProtocolRevision (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern char *SmsClientID (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern IceConn SmsGetIceConnection (
-#if NeedFunctionPrototypes
     SmsConn		/* smsConn */
-#endif
 );
 
 extern SmcErrorHandler SmcSetErrorHandler (
-#if NeedFunctionPrototypes
     SmcErrorHandler 	/* handler */
-#endif
 );
 
 extern SmsErrorHandler SmsSetErrorHandler (
-#if NeedFunctionPrototypes
     SmsErrorHandler 	/* handler */
-#endif
 );
 
 extern void SmFreeProperty (
-#if NeedFunctionPrototypes
     SmProp *		/* prop */
-#endif
 );
 
 extern void SmFreeReasons (
-#if NeedFunctionPrototypes
     int			/* count */,
     char **		/* reasonMsgs */
-#endif
 );
 
 _XFUNCPROTOEND