Remove trailing whitespace from header files

Performed with:
find include -name '*.h' | xargs perl -i -p -e 's{[ \t]+$}{}'
"git diff -w" shows no changes from this changeset.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

31 files changed, 220 insertions, 220 deletions

diff --git a/include/X11/extensions/XKB.h b/include/X11/extensions/XKB.h
index ee4f740..b46be8a 100644
--- a/include/X11/extensions/XKB.h
+++ b/include/X11/extensions/XKB.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -67,10 +67,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbNumberEvents			(XkbEventCode+1)
 
     /*
-     * XKB has a minor event code so it can use one X event code for 
-     * multiple purposes.  
+     * XKB has a minor event code so it can use one X event code for
+     * multiple purposes.
      *  - reported in the xkbType field of all XKB events.
-     *  - XkbSelectEventDetails: Indicates the event for which event details 
+     *  - XkbSelectEventDetails: Indicates the event for which event details
      *    are being changed
      */
 #define	XkbNewKeyboardNotify		0
@@ -158,7 +158,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      * A further reason for the error is encoded into to most significant
      * byte of the resourceID for the error:
      *    XkbErr_BadDevice - the device in question was not found
-     *    XkbErr_BadClass  - the device was found but it doesn't belong to 
+     *    XkbErr_BadClass  - the device was found but it doesn't belong to
      *                       the appropriate class.
      *    XkbErr_BadId     - the device was found and belongs to the right
      *                       class, but not feedback with a matching id was
@@ -212,11 +212,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
     /*
      * Controls detail masks:
      *  The controls specified in XkbAllControlsMask:
-     *  - The 'changed' field of ControlsNotify events reports which of 
+     *  - The 'changed' field of ControlsNotify events reports which of
      *    the keyboard controls have changed.
      *  - The 'changeControls' field of the SetControls request specifies
      *    the controls for which values are to be changed.
-     *  - Used as an event detail mask to limit the conditions under 
+     *  - Used as an event detail mask to limit the conditions under
      *    which ControlsNotify events are reported.
      *
      *  The controls specified in the XkbAllBooleanCtrlsMask:
@@ -229,7 +229,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      *  - The 'accessXTimeoutMask' and 'accessXTimeoutValues' fields of
      *    an XkbControlsRec specify the controls to be changed if the keyboard
      *    times out and the values to which they should be changed.
-     *  - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags 
+     *  - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags
      *    request specifies the specify the controls to be reset when the
      *    client exits and the values to which they should be reset.
      *  - The 'ctrls' field of an indicator map specifies the controls
@@ -267,8 +267,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      *  - The 'accessXOptions' field of an XkbControlsRec specifies the
      *    AccessX options that are currently in effect.
      *  - The 'accessXTimeoutOptionsMask' and 'accessXTimeoutOptionsValues'
-     *    fields of an XkbControlsRec specify the Access X options to be 
-     *    changed if the keyboard times out and the values to which they 
+     *    fields of an XkbControlsRec specify the Access X options to be
+     *    changed if the keyboard times out and the values to which they
      *    should be changed.
      */
 #define	XkbAX_SKPressFBMask	(1L << 0)
@@ -293,7 +293,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      * XkbUseCorePtr is used to specify the core pointer without having
      *			to look up its X input extension identifier.
      * XkbDfltXIClass is used to specify "don't care" any place that the
-     *			XKB protocol is looking for an X Input Extension 
+     *			XKB protocol is looking for an X Input Extension
      *			device class.
      * XkbDfltXIId is used to specify "don't care" any place that the
      *			XKB protocol is looking for an X Input Extension
@@ -309,9 +309,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      * XkbExplicitXIDevice(d) True if 'd' explicitly specifies a device
      * XkbExplicitXIClass(c)  True if 'c' explicitly specifies a device class
      * XkbExplicitXIId(c)     True if 'i' explicitly specifies a device id
-     * XkbSingleXIClass(c)    True if 'c' specifies exactly one device class, 
+     * XkbSingleXIClass(c)    True if 'c' specifies exactly one device class,
      *                        including the default.
-     * XkbSingleXIId(i)       True if 'i' specifies exactly one device 
+     * XkbSingleXIId(i)       True if 'i' specifies exactly one device
      *	                      identifier, including the default.
      */
 #define	XkbUseCoreKbd		0x0100
@@ -456,9 +456,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbSA_SwitchAbsolute	(1L << 2)
 
     /*
-     * The following values apply to the SA_DeviceValuator 
-     * action only.  Valuator operations specify the action 
-     * to be taken.   Values specified in the action are 
+     * The following values apply to the SA_DeviceValuator
+     * action only.  Valuator operations specify the action
+     * to be taken.   Values specified in the action are
      * multiplied by 2^scale before they are applied.
      */
 #define	XkbSA_IgnoreVal		(0x00)
@@ -510,7 +510,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	(1<<XkbSA_Terminate)|(1<<XkbSA_SwitchScreen)|(1<<XkbSA_SetControls)|\
 	(1<<XkbSA_LockControls)|(1<<XkbSA_ActionMessage)|\
 	(1<<XkbSA_RedirectKey)|(1<<XkbSA_DeviceBtn)|(1<<XkbSA_LockDeviceBtn))
-	 
+
     /*
      * Macros to classify key actions
      */
@@ -524,7 +524,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
      *    KB_Permanent indicates that the behavior describes an unalterable
      *    characteristic of the keyboard, not an XKB software-simulation of
      *    the listed behavior.
-     * Key Behavior Types:  
+     * Key Behavior Types:
      *    Specifies the behavior of the underlying key.
      */
 #define	XkbKB_Permanent		0x80
@@ -645,7 +645,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
     /*
      * Symbol interpretations match specification:
-     *  - Used in the match field of a symbol interpretation to specify 
+     *  - Used in the match field of a symbol interpretation to specify
      *    the conditions under which an interpretation is used.
      */
 #define	XkbSI_LevelOneOnly	(0x80)
diff --git a/include/X11/extensions/XKBgeom.h b/include/X11/extensions/XKBgeom.h
index cef78fa..380fa18 100644
--- a/include/X11/extensions/XKBgeom.h
+++ b/include/X11/extensions/XKBgeom.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/include/X11/extensions/XKBproto.h b/include/X11/extensions/XKBproto.h
index b867659..de0eee8 100644
--- a/include/X11/extensions/XKBproto.h
+++ b/include/X11/extensions/XKBproto.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/include/X11/extensions/XKBsrv.h b/include/X11/extensions/XKBsrv.h
index be7e978..deb7197 100644
--- a/include/X11/extensions/XKBsrv.h
+++ b/include/X11/extensions/XKBsrv.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -532,7 +532,7 @@ extern void XkbUpdateKeyTypesFromCore(
     XkbChangesPtr	/* pChanges */
 );
 
-extern	void XkbUpdateDescActions(	
+extern	void XkbUpdateDescActions(
     XkbDescPtr		/* xkb */,
     KeyCode		/* first */,
     CARD8		/* num */,
@@ -626,7 +626,7 @@ extern void XkbUpdateLedAutoState(
     XkbEventCausePtr		/* cause */
 );
 
-extern void XkbFlushLedEvents(	
+extern void XkbFlushLedEvents(
     DeviceIntPtr		/* dev */,
     DeviceIntPtr		/* kbd */,
     XkbSrvLedInfoPtr		/* sli */,
@@ -990,7 +990,7 @@ extern void	XkbConvertCase(
 	KeySym *		/* upper */
 );
 
-extern	Status	 XkbChangeKeycodeRange(	
+extern	Status	 XkbChangeKeycodeRange(
 	XkbDescPtr		/* xkb */,
 	int 			/* minKC */,
 	int 			/* maxKC */,
diff --git a/include/X11/extensions/XKBstr.h b/include/X11/extensions/XKBstr.h
index 893a04b..ef26911 100644
--- a/include/X11/extensions/XKBstr.h
+++ b/include/X11/extensions/XKBstr.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -393,7 +393,7 @@ typedef struct _XkbIndicatorMapRec {
 			     ((i)->ctrls)))
 #define	XkbIM_InUse(i)	(((i)->flags)||((i)->which_groups)||\
 					((i)->which_mods)||((i)->ctrls))
-	
+
 
 typedef struct _XkbIndicatorRec {
 	unsigned long	  	phys_indicators;
@@ -410,7 +410,7 @@ typedef struct _XkbKeyAliasRec {
 } XkbKeyAliasRec,*XkbKeyAliasPtr;
 
 	/*
-	 * Names for everything 
+	 * Names for everything
 	 */
 typedef struct _XkbNamesRec {
 	Atom		  keycodes;
@@ -548,7 +548,7 @@ typedef struct _XkbChanges {
 } XkbChangesRec, *XkbChangesPtr;
 
 	/*
-	 * These data structures are used to construct a keymap from 
+	 * These data structures are used to construct a keymap from
 	 * a set of components or to list components in the server
 	 * database.
 	 */
@@ -582,8 +582,8 @@ typedef struct _XkbComponentList {
 } XkbComponentListRec, *XkbComponentListPtr;
 
 	/*
-	 * The following data structures describe and track changes to a 
-	 * non-keyboard extension device 
+	 * The following data structures describe and track changes to a
+	 * non-keyboard extension device
 	 */
 typedef struct _XkbDeviceLedInfo {
 	unsigned short			led_class;
diff --git a/include/X11/extensions/XResproto.h b/include/X11/extensions/XResproto.h
index d7e20b1..13b5cdb 100644
--- a/include/X11/extensions/XResproto.h
+++ b/include/X11/extensions/XResproto.h
@@ -40,26 +40,26 @@ typedef struct {
 
 typedef struct _XResQueryVersion {
    CARD8   reqType;
-   CARD8   XResReqType; 
+   CARD8   XResReqType;
    CARD16  length B16;
    CARD8   client_major;
    CARD8   client_minor;
-   CARD16  unused B16;           
+   CARD16  unused B16;
 } xXResQueryVersionReq;
 #define sz_xXResQueryVersionReq 8
 
 typedef struct {
    CARD8   type;
    CARD8   pad1;
-   CARD16  sequenceNumber B16; 
+   CARD16  sequenceNumber B16;
    CARD32  length B32;
-   CARD16  server_major B16;      
-   CARD16  server_minor B16;      
+   CARD16  server_major B16;
+   CARD16  server_minor B16;
    CARD32  pad2 B32;
    CARD32  pad3 B32;
    CARD32  pad4 B32;
    CARD32  pad5 B32;
-   CARD32  pad6 B32; 
+   CARD32  pad6 B32;
 } xXResQueryVersionReply;
 #define sz_xXResQueryVersionReply  32
 
@@ -67,22 +67,22 @@ typedef struct {
 
 typedef struct _XResQueryClients {
    CARD8   reqType;
-   CARD8   XResReqType;       
+   CARD8   XResReqType;
    CARD16  length B16;
 } xXResQueryClientsReq;
 #define sz_xXResQueryClientsReq 4
 
 typedef struct {
    CARD8   type;
-   CARD8   pad1;     
-   CARD16  sequenceNumber B16;  
+   CARD8   pad1;
+   CARD16  sequenceNumber B16;
    CARD32  length B32;
    CARD32  num_clients B32;
    CARD32  pad2 B32;
    CARD32  pad3 B32;
    CARD32  pad4 B32;
    CARD32  pad5 B32;
-   CARD32  pad6 B32;        
+   CARD32  pad6 B32;
 } xXResQueryClientsReply;
 #define sz_xXResQueryClientsReply  32
 
@@ -98,8 +98,8 @@ typedef struct _XResQueryClientResources {
 
 typedef struct {
    CARD8   type;
-   CARD8   pad1;     
-   CARD16  sequenceNumber B16;  
+   CARD8   pad1;
+   CARD16  sequenceNumber B16;
    CARD32  length B32;
    CARD32  num_types B32;
    CARD32  pad2 B32;
diff --git a/include/X11/extensions/compositeproto.h b/include/X11/extensions/compositeproto.h
index 0417f2c..c9ffb74 100644
--- a/include/X11/extensions/compositeproto.h
+++ b/include/X11/extensions/compositeproto.h
@@ -52,7 +52,7 @@
 #define Region CARD32
 #define Pixmap CARD32
 
-/* 
+/*
  * requests and replies
  */
 typedef struct {
diff --git a/include/X11/extensions/damageproto.h b/include/X11/extensions/damageproto.h
index 107e192..7497d74 100644
--- a/include/X11/extensions/damageproto.h
+++ b/include/X11/extensions/damageproto.h
@@ -52,7 +52,7 @@ typedef struct {
     CARD16  length B16;
 } xDamageReq;
 
-/* 
+/*
  * requests and replies
  */
 
diff --git a/include/X11/extensions/lgewire.h b/include/X11/extensions/lgewire.h
index 75ec0a4..4e5a036 100644
--- a/include/X11/extensions/lgewire.h
+++ b/include/X11/extensions/lgewire.h
@@ -1,6 +1,6 @@
 /************************************************************
 
-Copyright (c) 2004, Sun Microsystems, Inc. 
+Copyright (c) 2004, Sun Microsystems, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
 /*
  * lge.h - Looking Glass Extension Definitions
  */
- 
+
 #ifndef _LGEWIRE_H
 #define _LGEWIRE_H
 
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #define LGE_NAME "LGE"
 
 /* Current interface version numbers */
-#define LGE_MAJOR_VERSION   5      
+#define LGE_MAJOR_VERSION   5
 #define LGE_MINOR_VERSION   0
 
 /* Display Server is alive */
@@ -52,7 +52,7 @@ in this Software without prior written authorization from The Open Group.
 #define LGE_CLIENT_EVENT_DELIVERER   2
 
 typedef struct {
-    CARD8       reqType;		
+    CARD8       reqType;
     CARD8       lgeReqType;
     CARD16	length B16;
 } xLgeQueryVersionReq;
@@ -61,7 +61,7 @@ typedef struct {
 
 typedef struct {
     /* Always X_Reply */
-    BYTE        type;			
+    BYTE        type;
     CARD8       unused;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
@@ -91,28 +91,28 @@ typedef struct {
     CARD8  lgeReqType;
     CARD16 length B16;
     /* The pseudo-root window of the screen */
-    Window prw;  
+    Window prw;
 } xLgeRegisterScreenReq;
 
 #define sz_xLgeRegisterScreenReq sizeof(xLgeRegisterScreenReq)
 
-typedef struct {                                            
-    CARD8     reqType;                                               
-    CARD8     lgeReqType;                                          
-    CARD16    length B16;                                            
+typedef struct {
+    CARD8     reqType;
+    CARD8     lgeReqType;
+    CARD16    length B16;
     BOOL      enable;
     CARD8     pad1;
     CARD16    pad2 B16;
-} xLgeControlLgModeReq;                                                       
+} xLgeControlLgModeReq;
 
 #define sz_xLgeControlLgModeReq sizeof(xLgeControlLgModeReq)
 
-typedef struct {                                            
-    CARD8     reqType;                                               
-    CARD8     lgeReqType;                                          
-    CARD16    length B16;                                            
-    xEvent    event;                                                 
-} xLgeSendEventReq;                                                       
+typedef struct {
+    CARD8     reqType;
+    CARD8     lgeReqType;
+    CARD16    length B16;
+    xEvent    event;
+} xLgeSendEventReq;
 
 #define sz_xLgeSendEventReq sizeof(xLgeSendEventReq)
 
diff --git a/include/X11/extensions/panoramiXproto.h b/include/X11/extensions/panoramiXproto.h
index 6fd1a02..ee1c246 100644
--- a/include/X11/extensions/panoramiXproto.h
+++ b/include/X11/extensions/panoramiXproto.h
@@ -47,7 +47,7 @@ typedef struct _PanoramiXQueryVersion {
 	CARD16	length B16;
 	CARD8	clientMajor;
 	CARD8	clientMinor;
-	CARD16	unused B16;           
+	CARD16	unused B16;
 } xPanoramiXQueryVersionReq;
 
 #define sz_xPanoramiXQueryVersionReq	8
@@ -57,8 +57,8 @@ typedef struct {
 	CARD8	pad1;			/* unused	*/
 	CARD16	sequenceNumber  B16;	/* last sequence number */
 	CARD32	length  B32;		/* 0 */
-	CARD16	majorVersion  B16;	
-	CARD16	minorVersion  B16;	
+	CARD16	majorVersion  B16;
+	CARD16	minorVersion  B16;
 	CARD32	pad2	B32;		/* unused */
 	CARD32	pad3	B32;		/* unused */
 	CARD32	pad4	B32;		/* unused */
@@ -75,7 +75,7 @@ typedef	struct	_PanoramiXGetState {
         CARD16  length B16;
 	CARD32  window B32;
 } xPanoramiXGetStateReq;
-#define sz_xPanoramiXGetStateReq	8	
+#define sz_xPanoramiXGetStateReq	8
 
 typedef struct {
 	BYTE	type;
@@ -121,11 +121,11 @@ typedef	struct	_PanoramiXGetScreenSize {
 	CARD32  window B32;
 	CARD32	screen B32;
 } xPanoramiXGetScreenSizeReq;
-#define sz_xPanoramiXGetScreenSizeReq	12	
+#define sz_xPanoramiXGetScreenSizeReq	12
 
 typedef struct {
 	BYTE	type;
-	CARD8	pad1;			
+	CARD8	pad1;
 	CARD16	sequenceNumber B16;
 	CARD32	length	B32;
 	CARD32	width	B32;
@@ -135,7 +135,7 @@ typedef struct {
 	CARD32	pad2	B32;		/* unused */
 	CARD32	pad3	B32;		/* unused */
 } xPanoramiXGetScreenSizeReply;
-#define sz_panoramiXGetScreenSizeReply 32	
+#define sz_panoramiXGetScreenSizeReply 32
 
 /************  Alternate protocol  ******************/
 
@@ -148,7 +148,7 @@ typedef struct {
 
 typedef struct {
 	BYTE	type;
-	CARD8	pad1;			
+	CARD8	pad1;
 	CARD16	sequenceNumber B16;
 	CARD32	length	B32;
 	CARD32	state	B32;
@@ -158,7 +158,7 @@ typedef struct {
 	CARD32	pad5	B32;
 	CARD32	pad6	B32;
 } xXineramaIsActiveReply;
-#define sz_XineramaIsActiveReply 32	
+#define sz_XineramaIsActiveReply 32
 
 
 typedef struct {
@@ -170,7 +170,7 @@ typedef struct {
 
 typedef struct {
 	BYTE	type;
-	CARD8	pad1;			
+	CARD8	pad1;
 	CARD16	sequenceNumber B16;
 	CARD32	length	B32;
 	CARD32	number	B32;
@@ -180,7 +180,7 @@ typedef struct {
 	CARD32	pad5	B32;
 	CARD32	pad6	B32;
 } xXineramaQueryScreensReply;
-#define sz_XineramaQueryScreensReply 32	
+#define sz_XineramaQueryScreensReply 32
 
 typedef struct {
 	INT16   x_org   B16;
@@ -190,4 +190,4 @@ typedef struct {
 } xXineramaScreenInfo;
 #define sz_XineramaScreenInfo 8
 
-#endif 
+#endif
diff --git a/include/X11/extensions/presentproto.h b/include/X11/extensions/presentproto.h
index 08ddc05..eb2bb96 100644
--- a/include/X11/extensions/presentproto.h
+++ b/include/X11/extensions/presentproto.h
@@ -210,7 +210,7 @@ typedef struct {
     Window window B32;
     Pixmap pixmap B32;
     CARD32 serial B32;
-    
+
     /* 32-byte boundary */
 
     Region valid_region B32;
diff --git a/include/X11/extensions/randrproto.h b/include/X11/extensions/randrproto.h
index b0fd7f0..0966b4b 100644
--- a/include/X11/extensions/randrproto.h
+++ b/include/X11/extensions/randrproto.h
@@ -68,7 +68,7 @@ typedef struct {
 } xScreenSizes;
 #define sz_xScreenSizes 8
 
-/* 
+/*
  * requests and replies
  */
 
@@ -103,7 +103,7 @@ typedef struct {
 } xRRGetScreenInfoReq;
 #define sz_xRRGetScreenInfoReq   8
 
-/* 
+/*
  * the xRRScreenInfoReply structure is followed by:
  *
  * the size information
@@ -158,7 +158,7 @@ typedef struct {
     CARD8   status;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    Time    newTimestamp B32;  
+    Time    newTimestamp B32;
     Time    newConfigTimestamp B32;
     Window  root;
     CARD16  subpixelOrder B16;
@@ -292,7 +292,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RROutput	output B32;
-} xRRListOutputPropertiesReq; 
+} xRRListOutputPropertiesReq;
 #define sz_xRRListOutputPropertiesReq	8
 
 typedef struct {
@@ -316,7 +316,7 @@ typedef struct {
     CARD16	length B16;
     RROutput	output B32;
     Atom	property B32;
-} xRRQueryOutputPropertyReq; 
+} xRRQueryOutputPropertyReq;
 #define sz_xRRQueryOutputPropertyReq	12
 
 typedef struct {
@@ -345,7 +345,7 @@ typedef struct {
     BOOL	pending;
     BOOL	range;
     CARD16	pad B16;
-} xRRConfigureOutputPropertyReq; 
+} xRRConfigureOutputPropertyReq;
 #define sz_xRRConfigureOutputPropertyReq	16
 
 typedef struct {
@@ -410,7 +410,7 @@ typedef struct {
     CARD16	length B16;
     Window	window B32;
     xRRModeInfo	modeInfo;
-} xRRCreateModeReq; 
+} xRRCreateModeReq;
 #define sz_xRRCreateModeReq		40
 
 typedef struct {
@@ -459,7 +459,7 @@ typedef struct {
     CARD16	length B16;
     RRCrtc	crtc B32;
     Time	configTimestamp B32;
-} xRRGetCrtcInfoReq; 
+} xRRGetCrtcInfoReq;
 #define sz_xRRGetCrtcInfoReq		12
 
 typedef struct {
@@ -492,7 +492,7 @@ typedef struct {
     RRMode	mode B32;
     Rotation	rotation B16;
     CARD16	pad B16;
-} xRRSetCrtcConfigReq; 
+} xRRSetCrtcConfigReq;
 #define sz_xRRSetCrtcConfigReq		28
 
 typedef struct {
@@ -514,7 +514,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-} xRRGetCrtcGammaSizeReq; 
+} xRRGetCrtcGammaSizeReq;
 #define sz_xRRGetCrtcGammaSizeReq	8
 
 typedef struct {
@@ -537,7 +537,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-} xRRGetCrtcGammaReq; 
+} xRRGetCrtcGammaReq;
 #define sz_xRRGetCrtcGammaReq		8
 
 typedef struct {
@@ -724,7 +724,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRProvider	provider B32;
-} xRRListProviderPropertiesReq; 
+} xRRListProviderPropertiesReq;
 #define sz_xRRListProviderPropertiesReq	8
 
 typedef struct {
@@ -748,7 +748,7 @@ typedef struct {
     CARD16	length B16;
     RRProvider	provider B32;
     Atom	property B32;
-} xRRQueryProviderPropertyReq; 
+} xRRQueryProviderPropertyReq;
 #define sz_xRRQueryProviderPropertyReq	12
 
 typedef struct {
@@ -777,7 +777,7 @@ typedef struct {
     BOOL	pending;
     BOOL	range;
     CARD16	pad B16;
-} xRRConfigureProviderPropertyReq; 
+} xRRConfigureProviderPropertyReq;
 #define sz_xRRConfigureProviderPropertyReq	16
 
 typedef struct {
@@ -1010,7 +1010,7 @@ typedef struct {
     CARD8	randrReqType;
     CARD16	length B16;
     RRCrtc	crtc B32;
-} xRRGetPanningReq; 
+} xRRGetPanningReq;
 #define sz_xRRGetPanningReq		8
 
 typedef struct {
@@ -1052,7 +1052,7 @@ typedef struct {
     INT16	border_top B16;
     INT16	border_right B16;
     INT16	border_bottom B16;
-} xRRSetPanningReq; 
+} xRRSetPanningReq;
 #define sz_xRRSetPanningReq		36
 
 typedef struct {
diff --git a/include/X11/extensions/recordconst.h b/include/X11/extensions/recordconst.h
index 4819de7..ecdd81b 100644
--- a/include/X11/extensions/recordconst.h
+++ b/include/X11/extensions/recordconst.h
@@ -5,16 +5,16 @@
  * its documentation for any purpose is hereby granted without fee, provided
  * that the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices 
+ * documentation, and that the name of Network Computing Devices
  * not be used in advertising or publicity pertaining to distribution
  * of the software without specific, written prior permission.
  *
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO 
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE 
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING 
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  **************************************************************************/
 
diff --git a/include/X11/extensions/saverproto.h b/include/X11/extensions/saverproto.h
index b3e5653..f0879af 100644
--- a/include/X11/extensions/saverproto.h
+++ b/include/X11/extensions/saverproto.h
@@ -51,7 +51,7 @@ typedef struct _ScreenSaverQueryVersion {
     CARD16 length B16;
     CARD8 clientMajor;
     CARD8 clientMinor;
-    CARD16 unused B16;	
+    CARD16 unused B16;
 } xScreenSaverQueryVersionReq;
 #define sz_xScreenSaverQueryVersionReq	8
 
diff --git a/include/X11/extensions/syncstr.h b/include/X11/extensions/syncstr.h
index 25a4827..95bc2ac 100644
--- a/include/X11/extensions/syncstr.h
+++ b/include/X11/extensions/syncstr.h
@@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or Olivetti
 not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
 SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -162,7 +162,7 @@ extern pointer SyncCreateSystemCounter(
         pointer /* pCounter */,
         CARD64 * /* pValue_return */), /* XXX prototype */
     void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
+        pointer /* pCounter */,
         CARD64 * /* pbracket_less */,
         CARD64 * /* pbracket_greater */)
 );
diff --git a/include/X11/extensions/xcalibrateproto.h b/include/X11/extensions/xcalibrateproto.h
index feded32..2301754 100644
--- a/include/X11/extensions/xcalibrateproto.h
+++ b/include/X11/extensions/xcalibrateproto.h
@@ -25,7 +25,7 @@
 #ifndef XCALIBRATEPROTO_H
 #define XCALIBRATEPROTO_H
 
-/* 
+/*
  * requests and replies
  */
 typedef struct {
diff --git a/include/X11/extensions/xf86dga1proto.h b/include/X11/extensions/xf86dga1proto.h
index 5c53cb2..c724ba3 100644
--- a/include/X11/extensions/xf86dga1proto.h
+++ b/include/X11/extensions/xf86dga1proto.h
@@ -46,7 +46,7 @@ typedef struct _XF86DGAInstallColormap{
     CARD8	dgaReqType;
     CARD16	length B16;
     CARD16	screen B16;
-    CARD16	pad2; 
+    CARD16	pad2;
     CARD32	id B32;  /* colormap. */
 } xXF86DGAInstallColormapReq;
 #define sz_xXF86DGAInstallColormapReq        12
diff --git a/include/X11/extensions/xf86dgaconst.h b/include/X11/extensions/xf86dgaconst.h
index 63829bc..b21e84f 100644
--- a/include/X11/extensions/xf86dgaconst.h
+++ b/include/X11/extensions/xf86dgaconst.h
@@ -66,9 +66,9 @@ typedef struct {
    int imageHeight;
    int pixmapWidth;	/* Xlib accessible portion (pixels) */
    int pixmapHeight;	/* both fields ignored if no concurrent access */
-   int bytesPerScanline; 
+   int bytesPerScanline;
    int byteOrder;	/* MSBFirst, LSBFirst */
-   int depth;		
+   int depth;
    int bitsPerPixel;
    unsigned long redMask;
    unsigned long greenMask;
diff --git a/include/X11/extensions/xf86dgaproto.h b/include/X11/extensions/xf86dgaproto.h
index 8b7f13d..8d2fb64 100644
--- a/include/X11/extensions/xf86dgaproto.h
+++ b/include/X11/extensions/xf86dgaproto.h
@@ -130,7 +130,7 @@ typedef struct {
     BOOL	pad1;
     CARD16	sequenceNumber B16;
     CARD32	length B32;		/* device name size if there is one */
-    CARD32	mem1 B32;		/* physical memory */	
+    CARD32	mem1 B32;		/* physical memory */
     CARD32	mem2 B32;		/* spillover for _alpha_ */
     CARD32	size B32;		/* size of map in bytes */
     CARD32	offset B32;		/* optional offset into device */
@@ -232,8 +232,8 @@ typedef struct _XDGAGetViewportStatus {
 #define sz_xXDGAGetViewportStatusReq	8
 
 typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
+    BYTE	type;
+    BOOL	pad1;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD32	status B32;
@@ -254,8 +254,8 @@ typedef struct _XDGASync {
 #define sz_xXDGASyncReq	8
 
 typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
+    BYTE	type;
+    BOOL	pad1;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD32	pad2 B32;
@@ -289,8 +289,8 @@ typedef struct {
 #define sz_xXDGAChangePixmapModeReq	16
 
 typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
+    BYTE	type;
+    BOOL	pad1;
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     CARD16	x B16;
diff --git a/include/X11/extensions/xf86mscstr.h b/include/X11/extensions/xf86mscstr.h
index 637d3a5..9eab965 100644
--- a/include/X11/extensions/xf86mscstr.h
+++ b/include/X11/extensions/xf86mscstr.h
@@ -42,7 +42,7 @@ typedef struct {
 typedef struct _XF86MiscGetSaver {
     CARD8       reqType;                /* always XF86MiscReqCode */
     CARD8       xf86miscReqType;     /* always X_XF86MiscGetSaver */
-    CARD16      length B16; 
+    CARD16      length B16;
     CARD16      screen B16;
     CARD16      pad B16;
 } xXF86MiscGetSaverReq;
diff --git a/include/X11/extensions/xf86rush.h b/include/X11/extensions/xf86rush.h
index 1db7d13..5cf0c16 100644
--- a/include/X11/extensions/xf86rush.h
+++ b/include/X11/extensions/xf86rush.h
@@ -56,7 +56,7 @@ Bool XF86RushUnlockPixmap(
     Display *		/* dpy */,
     int			/* screen */,
     Pixmap		/* Pixmap */
-); 
+);
 
 Bool XF86RushUnlockAllPixmaps(
     Display *		/* dpy */
diff --git a/include/X11/extensions/xf86vm.h b/include/X11/extensions/xf86vm.h
index ddf4dac..a874ab5 100644
--- a/include/X11/extensions/xf86vm.h
+++ b/include/X11/extensions/xf86vm.h
@@ -16,13 +16,13 @@ included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES 
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
 or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
diff --git a/include/X11/extensions/xf86vmproto.h b/include/X11/extensions/xf86vmproto.h
index 0d3955c..4c7966f 100644
--- a/include/X11/extensions/xf86vmproto.h
+++ b/include/X11/extensions/xf86vmproto.h
@@ -16,13 +16,13 @@ included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES 
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
 or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
@@ -514,7 +514,7 @@ typedef struct _XF86VidModeSetGammaRamp {
     CARD16      screen B16;
     CARD16      size B16;
 } xXF86VidModeSetGammaRampReq;
-#define sz_xXF86VidModeSetGammaRampReq             8 
+#define sz_xXF86VidModeSetGammaRampReq             8
 
 typedef struct _XF86VidModeGetGammaRamp {
     CARD8       reqType;                /* always XF86VidModeReqCode */
diff --git a/include/X11/extensions/xfixesproto.h b/include/X11/extensions/xfixesproto.h
index fcf409a..6a1c3a5 100644
--- a/include/X11/extensions/xfixesproto.h
+++ b/include/X11/extensions/xfixesproto.h
@@ -72,7 +72,7 @@ typedef struct {
     CARD16  length B16;
 } xXFixesReq;
 
-/* 
+/*
  * requests and replies
  */
 typedef struct {
@@ -310,7 +310,7 @@ typedef struct {
 } xXFixesTranslateRegionReq;
 
 #define sz_xXFixesTranslateRegionReq	12
-    
+
 typedef struct {
     CARD8   reqType;
     CARD8   xfixesReqType;
diff --git a/include/X11/extensions/xtrapbits.h b/include/X11/extensions/xtrapbits.h
index 1189dc7..794cc9e 100644
--- a/include/X11/extensions/xtrapbits.h
+++ b/include/X11/extensions/xtrapbits.h
@@ -7,16 +7,16 @@
 #define __XTRAPBITS__ "@(#)xtrapbits.h	1.6 - 90/09/18  "
 
 /*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation, 
+Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation,
 Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/extensions/xtrapddmi.h b/include/X11/extensions/xtrapddmi.h
index c187a3a..12283f7 100644
--- a/include/X11/extensions/xtrapddmi.h
+++ b/include/X11/extensions/xtrapddmi.h
@@ -6,13 +6,13 @@
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -78,7 +78,7 @@ typedef struct
 #define XETrapSetHeaderReply(phdr)      ((phdr)->type = 0x5L)
 
 #ifndef vaxc
-#define globaldef 
+#define globaldef
 #define globalref extern
 #endif
 
diff --git a/include/X11/extensions/xtrapdi.h b/include/X11/extensions/xtrapdi.h
index 34aa94c..a0d8a88 100644
--- a/include/X11/extensions/xtrapdi.h
+++ b/include/X11/extensions/xtrapdi.h
@@ -3,16 +3,16 @@
 #define __XTRAPDI__
 
 /*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp., 
+Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp.,
 Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -89,7 +89,7 @@ typedef CARD8 ReqFlags[XETrapMaxRequest];
 
 /* This is used as flags to indicate desired event traps
  * Until events become *fully vectored*, we'll have to fake it
- * by defining an array of 5 events (KeyPress, KeyRelease, 
+ * by defining an array of 5 events (KeyPress, KeyRelease,
  * ButtonPress, ButtonRelease, and MotionNotify.  The extra 2
  * are required as the event types start with "2" (errors and
  * replies are 0 & 1).  The event type is the index into the
@@ -108,7 +108,7 @@ typedef CARD8 EventFlags[XETrapMaxEvent];
 /* This structure is used in a request to specify the types of
  * configuration information that should be changed or updated.
  */
-typedef struct 
+typedef struct
 {
     CARD8      valid[4L];  /* Bits TRUE indicates data field is used */
     CARD8      data[4L];   /* Bits looked at if corresponding valid bit set */
@@ -138,8 +138,8 @@ typedef struct /* used by XEConfigRequest */
     XETrapFlags flags;            /* Flags to specify what should be chg'd */
     CARD16      max_pkt_size B16; /* Maximum number of bytes in a packet */
     CARD8       cmd_key;       /* Keyboard command_key (KeyCode) */
-/* 
- * cmd_key is intentionally *not* defined KeyCode since it's definition is 
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
  * ambiguous (int in Intrinsic.h and unsigned char in X.h.
  */
     CARD8      pad[1L];           /* pad out to a quadword */
@@ -180,7 +180,7 @@ typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */
 /* The following are formats of a request to the XTRAP
  * extension.  The data-less XTrap requests all use xXTrapReq
  */
-typedef struct 
+typedef struct
 {
     CARD8  reqType;
     CARD8  minor_opcode;
@@ -190,7 +190,7 @@ typedef struct
 /* the following works because all fields are defined as bit (Bnn) fields */
 #define sz_xXTrapReq (sizeof(xXTrapReq))
 /* For retrieving version/available info (passes lib-side protocol number) */
-typedef struct 
+typedef struct
 {
     CARD8  reqType;
     CARD8  minor_opcode;
@@ -201,7 +201,7 @@ typedef struct
 /* the following works because all fields are defined as bit (Bnn) fields */
 #define sz_xXTrapGetReq (sizeof(xXTrapGetReq))
 
-typedef struct 
+typedef struct
 {
     CARD8     reqType;
     CARD8     minor_opcode;
@@ -222,8 +222,8 @@ typedef struct
     /* End Shadow (XETrapFlags)*/
     CARD16      config_max_pkt_size B16; /* Max number of bytes in a packet */
     CARD8       config_cmd_key;       /* Keyboard command_key (KeyCode) */
-/* 
- * cmd_key is intentionally *not* defined KeyCode since it's definition is 
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
  * ambiguous (int in Intrinsic.h and unsigned char in X.h.
  */
     CARD8      config_pad[1L];           /* pad out to a quadword */
@@ -234,7 +234,7 @@ typedef struct
 #define sz_xXTrapConfigReq (sizeof(xXTrapConfigReq))
 
 #ifndef _XINPUT
-typedef struct 
+typedef struct
 {
     CARD8            reqType;
     CARD8            minor_opcode;
@@ -339,7 +339,7 @@ typedef struct
 #define PF_SunSparc      112L     /* server on Sun Sparc system */
 
 /* reply sent back by XETrapGetAvailable request */
-typedef struct 
+typedef struct
 {
     XETrapRepHdr       hdr;
     XETrapGetAvailRep  data;
@@ -348,7 +348,7 @@ typedef struct
 #define sz_xXTrapGetAvailReply  sizeof(xXTrapGetAvailReply)
 
 /* reply sent back by XETrapGetVersion request */
-typedef struct 
+typedef struct
 {
     XETrapRepHdr       hdr;
     XETrapGetVersRep  data;
@@ -379,7 +379,7 @@ typedef struct
 #define sz_xXTrapGetLITimReply  sizeof(xXTrapGetLITimReply)
 
 /* reply sent back by XETrapGetCurrent request */
-typedef struct 
+typedef struct
 {
     XETrapRepHdr     hdr;
     /*
@@ -396,8 +396,8 @@ typedef struct
     EventFlags  data_config_flags_event;
     CARD16      data_config_max_pkt_size B16; /* Max num of bytes in a pkt */
     CARD8       data_config_cmd_key;       /* Keyboard cmd_key (KeyCode) */
-/* 
- * cmd_key is intentionally *not* defined KeyCode since it's definition is 
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
  * ambiguous (int in Intrinsic.h and unsigned char in X.h.
  */
     CARD8      data_config_pad[1L];           /* pad out to a quadword */
@@ -414,7 +414,7 @@ typedef struct
  * reading arrays of CARD32s without using the _Read32 macro (see XERqsts.c).
  * This requires that none of the data be in the _Reply area.
  */
-typedef struct 
+typedef struct
 {
     CARD8  type;
     CARD8  detail;
diff --git a/include/X11/extensions/xtrapemacros.h b/include/X11/extensions/xtrapemacros.h
index f59ea33..89c8f63 100644
--- a/include/X11/extensions/xtrapemacros.h
+++ b/include/X11/extensions/xtrapemacros.h
@@ -3,16 +3,16 @@
 #define __XTRAPEMACROS__ "@(#)xtrapemacros.h	1.9 - 90/09/18  "
 
 /*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
 Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -37,7 +37,7 @@ SOFTWARE.
  *      Ken Miller
  *
  *  DESCRIPTION:
- *      This include file is designed to provide the *visible* 
+ *      This include file is designed to provide the *visible*
  *      interface to XTrap data structures.  Fields can be set
  *      using these macros by client programs unless otherwise
  *      specified; however, use of Trap Context convenience
diff --git a/include/X11/extensions/xtraplib.h b/include/X11/extensions/xtraplib.h
index db0289f..68c5892 100644
--- a/include/X11/extensions/xtraplib.h
+++ b/include/X11/extensions/xtraplib.h
@@ -1,19 +1,19 @@
 /* $XFree86$ */
 #ifndef __XTRAPLIB__
-#define __XTRAPLIB__ 
+#define __XTRAPLIB__
 
 
 /*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
 Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -105,7 +105,7 @@ typedef struct {
 } XETrapDataEvent;
 
 /* Trap Context structure for maintaining XTrap State for client */
-struct _XETC 
+struct _XETC
 {
     struct _XETC *next;         /* Ptr to next linked-listed TC */
     Display      *dpy;          /* Display ptr of current TC */
@@ -115,7 +115,7 @@ struct _XETC
     BYTE         *xbuff;        /* Pointer to buffer for XLib Communications */
     CARD16       xmax_size /*B16*/; /* Max Size of a request */
     XExtData     *ext_data;     /* hook for extension to hang data */
-    /* 
+    /*
      *  The following are initialized with the client-side version number
      *  However, when either a GetAvailable or GetVersion reply is received,
      *  these values are updated with the *oldest* version numbers.
diff --git a/include/X11/extensions/xtraplibp.h b/include/X11/extensions/xtraplibp.h
index 0c6ced2..aeb6b31 100644
--- a/include/X11/extensions/xtraplibp.h
+++ b/include/X11/extensions/xtraplibp.h
@@ -4,16 +4,16 @@
 
 
 /*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
 Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -53,7 +53,7 @@ XETC *XECreateTC (Display *dpy , CARD32 valuemask , XETCValues *value );
 int XEChangeTC (XETC *tc , CARD32 mask , XETCValues *values );
 void XEFreeTC (XETC *tc );
 int XETrapSetMaxPacket (XETC *tc , Bool set_flag , CARD16 size );
-int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key , 
+int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key ,
     Bool mod_flag );
 int XETrapSetTimestamps (XETC *tc , Bool set_flag , Bool delta_flag );
 int XETrapSetWinXY (XETC *tc , Bool set_flag );
@@ -64,7 +64,7 @@ int XETrapSetGrabServer (XETC *tc , Bool set_flag );
 int XETrapSetStatistics (XETC *tc , Bool set_flag );
 int XETrapSetRequests (XETC *tc , Bool set_flag , ReqFlags requests );
 int XETrapSetEvents (XETC *tc , Bool set_flag , EventFlags events );
-Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed , 
+Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed ,
     CARD8 *next_key , Bool *key_ignore );
 
 /* XERqsts.c */
@@ -75,17 +75,17 @@ int XEGetLastInpTimeRequest (XETC *tc , XETrapGetLastInpTimeRep *ret );
 int XEGetAvailableRequest (XETC *tc , XETrapGetAvailRep *ret );
 int XEStartTrapRequest (XETC *tc );
 int XEStopTrapRequest (XETC *tc );
-int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail , 
+int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail ,
     CARD16 x , CARD16 y , CARD8 screen );
 int XEGetCurrentRequest (XETC *tc , XETrapGetCurRep *ret );
 int XEGetStatisticsRequest (XETC *tc , XETrapGetStatsRep *ret );
 
 /* XECallBcks.c */
 int XEAddRequestCB (XETC *tc , CARD8 req , void_function func , BYTE *data );
-int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func , 
+int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func ,
     BYTE *data );
 int XEAddEventCB (XETC *tc , CARD8 evt , void_function func , BYTE *data );
-int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func , 
+int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func ,
     BYTE *data );
 
 /* The following seem to never be used.  Perhaps they should be removed */
diff --git a/include/X11/extensions/xtrapproto.h b/include/X11/extensions/xtrapproto.h
index b3e29cf..49614fd 100644
--- a/include/X11/extensions/xtrapproto.h
+++ b/include/X11/extensions/xtrapproto.h
@@ -6,13 +6,13 @@
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL