Update some missing files to libX11 1.3.4

nx-X11/lib/X11/XKBlibint.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.
 
@@ -104,7 +104,7 @@ typedef struct _XkbInfoRec {
 #define XKB_XLIB_MAP_MASK (XkbAllClientInfoMask)
 
 	/*
-	 * Handy helper macros 
+	 * Handy helper macros
 	 */
 #define	XKB_INSURE_SIZE(f,t,nNum,oNum)	{\
 	if ((f)==NULL)	\
@@ -157,7 +157,7 @@ extern KeySym _XLookupKeysym(
 );
 
 extern int _XRefreshKeyboardMapping(
-    XMappingEvent*	/* event_map */    
+    XMappingEvent*	/* event_map */
 );
 
 extern unsigned	_XKeysymToModifiers(
@@ -165,7 +165,7 @@ extern unsigned	_XKeysymToModifiers(
     KeySym 		/* ks */
 );
 
-extern int _XTranslateKey(	
+extern int _XTranslateKey(
     register Display *	/* dpy */,
     KeyCode 		/* keycode */,
     register unsigned int /* modifiers */,
@@ -295,8 +295,8 @@ extern char	*_XkbGetCharset(
 );
 
 extern int	 _XkbGetConverters(
-    char *		/* encoding_name */,
-    XkbConverters *	/* cvt_rtrn */
+    const char *       /* encoding_name */,
+    XkbConverters *    /* cvt_rtrn */
 );
 
 #ifdef	NEED_MAP_READERS

nx-X11/lib/X11/XKeysymDB

@@ -353,7 +353,7 @@ XF86Suspend		:1008FFA7
 XF86Hibernate		:1008FFA8
 XF86TouchpadToggle	:1008FFA9
 XF86TouchpadOn		:1008FFB0
-XF86TouchpadOff	:1008FFB1
+XF86TouchpadOff		:1008FFB1
 
 ! XFree86 special action keys
 XF86_Switch_VT_1	:1008FE01

nx-X11/lib/X11/Xatomtype.h

@@ -28,13 +28,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         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 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

nx-X11/lib/X11/XomGeneric.h

@@ -141,7 +141,7 @@ typedef struct _XOCGenericPart {
 
 typedef struct _XOCGenericRec {
     XOCMethods 		methods;
-    XOCCoreRec 		core;	
+    XOCCoreRec 		core;
     XOCGenericPart 	gen;
 } XOCGenericRec, *XOCGeneric;
 

nx-X11/lib/X11/XrmI.h

@@ -30,11 +30,11 @@ from The Open Group.
 /*
  * Macros to abstract out reading the file, and getting its size.
  *
- * You may need to redefine these for various other operating systems. 
+ * You may need to redefine these for various other operating systems.
  */
 
 #include	<nx-X11/Xos.h>
-#include        <sys/stat.h>                        
+#include        <sys/stat.h>
 
 #define GetSizeOfFile(fd,size)                      \
 {                                                   \

nx-X11/lib/X11/poly.h

@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         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 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
@@ -176,7 +176,7 @@ typedef struct {
  *     the polygon by incrementing the y coordinate.  We
  *     keep a list of edges which the current scanline crosses,
  *     sorted by x.  This list is called the Active Edge Table (AET)
- *     As we change the y-coordinate, we update each entry in 
+ *     As we change the y-coordinate, we update each entry in
  *     in the active edge table to reflect the edges new xcoord.
  *     This list must be sorted at each scanline in case
  *     two edges intersect.
@@ -203,7 +203,7 @@ typedef struct {
  * for the winding number rule
  */
 #define CLOCKWISE          1
-#define COUNTERCLOCKWISE  -1 
+#define COUNTERCLOCKWISE  -1
 
 typedef struct _EdgeTableEntry {
      int ymax;             /* ycoord at which we exit this edge. */