adapt include files to libX11 1.3.4

7 files changed, 54 insertions, 48 deletions

diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h
index fc94b08b8..38d302f0d 100644
--- a/nx-X11/lib/X11/XKBlib.h
+++ b/nx-X11/lib/X11/XKBlib.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.
 
@@ -77,7 +77,7 @@ typedef struct _XkbMapNotifyEvent {
 	KeyCode		first_key_act;
 	KeyCode		first_key_behavior;
 	KeyCode		first_key_explicit;
-	KeyCode		first_modmap_key;  
+	KeyCode		first_modmap_key;
 	KeyCode		first_vmodmap_key;
 	int		num_key_syms;
 	int		num_key_acts;
@@ -214,7 +214,7 @@ typedef struct _XkbActionMessage {
 	Bool 		key_event_follows;/* true if key event also generated */
 	int		group;		/* effective group */
 	unsigned int	mods;		/* effective mods */
-	char 		message[XkbActionMessageLength+1]; 
+	char 		message[XkbActionMessageLength+1];
 					/* message -- leave space for NUL */
 } XkbActionMessageEvent;
 
@@ -240,8 +240,8 @@ typedef struct _XkbExtensionDeviceNotify {
 	Time 		time;		/* milliseconds */
 	int 		xkb_type;	/* XkbExtensionDeviceNotify */
 	int	 	device;		/* device ID */
-	unsigned int	reason;		/* reason for the event */	
-	unsigned int	supported;	/* mask of supported features */	
+	unsigned int	reason;		/* reason for the event */
+	unsigned int	supported;	/* mask of supported features */
 	unsigned int	unsupported;	/* mask of unsupported features */
 					/* that some app tried to use */
 	int	 	first_btn;	/* first button that changed */
@@ -530,7 +530,7 @@ extern	Bool	 XkbSetIndicatorMap(
 #define	XkbNoteIndicatorStateChanges(o,n,w)\
 				((o)->state_changes|=((n)->state_changes&(w)))
 #define	XkbGetIndicatorMapChanges(d,x,c) \
-				(XkbGetIndicatorMap((d),(c)->map_changes,x)
+				(XkbGetIndicatorMap((d),(c)->map_changes,x))
 #define	XkbChangeIndicatorMaps(d,x,c) \
 				(XkbSetIndicatorMap((d),(c)->map_changes,x))
 
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h
index 4ec2e4ead..30037d4e2 100644
--- a/nx-X11/lib/X11/Xcms.h
+++ b/nx-X11/lib/X11/Xcms.h
@@ -2,7 +2,7 @@
 /*
  * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
  * 	All Rights Reserved
- * 
+ *
  * This file is a component of an X Window System-specific implementation
  * of Xcms based on the TekColor Color Management System.  Permission is
  * hereby granted to use, copy, modify, sell, and otherwise distribute this
@@ -10,10 +10,10 @@
  * that this copyright, permission, and disclaimer notice is reproduced in
  * all copies of this software and in supporting documentation.  TekColor
  * is a trademark of Tektronix, Inc.
- * 
+ *
  * Tektronix makes no representation about the suitability of this software
  * for any purpose.  It is provided "as is" and with all faults.
- * 
+ *
  * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
  * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
@@ -250,7 +250,7 @@ typedef void (*XcmsScreenFreeProc)(
  * XXX:  The use of the XcmsConversionProc type is broken.  The
  *       device-independent colour conversion code uses it as:
 
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, 
+typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
 				     unsigned int);
 
  *       while the device-dependent code uses it as:
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h
index 6e70ba743..ac0c835cf 100644
--- a/nx-X11/lib/X11/Xlib.h
+++ b/nx-X11/lib/X11/Xlib.h
@@ -4042,4 +4042,4 @@ extern void XFreeEventData(
 
 _XFUNCPROTOEND
 
-#endif /* _X11_XLIB_H_ */
+#endif /* _XLIB_H_ */
diff --git a/nx-X11/lib/X11/Xregion.h b/nx-X11/lib/X11/Xregion.h
index f555a8dd9..7b376e556 100644
--- a/nx-X11/lib/X11/Xregion.h
+++ b/nx-X11/lib/X11/Xregion.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
@@ -68,7 +68,7 @@ typedef struct {
 #endif
 
 
-/* 
+/*
  *   clip region
  */
 
@@ -79,13 +79,13 @@ typedef struct _XRegion {
     BOX extents;
 } REGION;
 
-/* Xutil.h contains the declaration: 
- * typedef struct _XRegion *Region; 
- */   
+/* Xutil.h contains the declaration:
+ * typedef struct _XRegion *Region;
+ */
 
 /*  1 if two BOXs overlap.
  *  0 if two BOXs do not overlap.
- *  Remember, x2 and y2 are not in the region 
+ *  Remember, x2 and y2 are not in the region
  */
 #define EXTENTCHECK(r1, r2) \
 	((r1)->x2 > (r2)->x1 && \
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h
index c8c92a048..a2f528c2a 100644
--- a/nx-X11/lib/X11/Xresource.h
+++ b/nx-X11/lib/X11/Xresource.h
@@ -28,13 +28,13 @@ Copyright 1987, 1988 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 _XrmHashBucketRec *XrmDatabase;
 
 
 extern void XrmDestroyDatabase(
-    XrmDatabase		/* database */    
+    XrmDatabase		/* database */
 );
 
 extern void XrmQPutResource(
@@ -331,7 +331,7 @@ typedef enum {
     XrmoptionResArg,	/* Resource and value in next argument in argv      */
     XrmoptionSkipArg,   /* Ignore this option and the next argument in argv */
     XrmoptionSkipLine,  /* Ignore this option and the rest of argv	    */
-    XrmoptionSkipNArgs	/* Ignore this option and the next 
+    XrmoptionSkipNArgs	/* Ignore this option and the next
 			   OptionDescRes.value arguments in argv */
 } XrmOptionKind;
 
@@ -349,7 +349,7 @@ extern void XrmParseCommand(
     int			/* table_count */,
     _Xconst char*	/* name */,
     int*		/* argc_in_out */,
-    char**		/* argv_in_out */		     
+    char**		/* argv_in_out */
 );
 
 _XFUNCPROTOEND
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index f42721244..2bed46f3f 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.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
@@ -52,8 +52,9 @@ SOFTWARE.
 
 /* You must include <nx-X11/Xlib.h> before including this file */
 #include <nx-X11/Xlib.h>
+#include <X11/keysym.h>
 
-/* 
+/*
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
  * value (x, y, width, height) was found in the parsed string.
  */
@@ -149,7 +150,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint)
 
 
 /*
- * new structure for manipulating TEXT properties; used with WM_NAME, 
+ * new structure for manipulating TEXT properties; used with WM_NAME,
  * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
  */
 typedef struct {
@@ -260,16 +261,16 @@ typedef struct _XComposeStatus {
    || ((KeySym)(keysym) == XK_Num_Lock))
 #endif
 /*
- * opaque reference to Region data type 
+ * opaque reference to Region data type
  */
-typedef struct _XRegion *Region; 
+typedef struct _XRegion *Region;
 
 /* Return values from XRectInRegion() */
- 
+
 #define RectangleOut 0
 #define RectangleIn  1
 #define RectanglePart 2
- 
+
 
 /*
  * Information used by the visual utility routines to find desired visual
@@ -450,7 +451,7 @@ extern Status XGetStandardColormap(
     Display*		/* display */,
     Window		/* w */,
     XStandardColormap*	/* colormap_return */,
-    Atom		/* property */			    
+    Atom		/* property */
 );
 
 extern Status XGetTextProperty(
@@ -475,7 +476,7 @@ extern Status XGetWMClientMachine(
 
 extern XWMHints *XGetWMHints(
     Display*		/* display */,
-    Window		/* w */		      
+    Window		/* w */
 );
 
 extern Status XGetWMIconName(
@@ -494,7 +495,7 @@ extern Status XGetWMNormalHints(
     Display*		/* display */,
     Window		/* w */,
     XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */ 
+    long*		/* supplied_return */
 );
 
 extern Status XGetWMSizeHints(
@@ -582,7 +583,7 @@ extern int XSetIconSizes(
     Display*		/* display */,
     Window		/* w */,
     XIconSize*		/* size_list */,
-    int			/* count */    
+    int			/* count */
 );
 
 extern int XSetNormalHints(
diff --git a/nx-X11/lib/X11/cursorfont.h b/nx-X11/lib/X11/cursorfont.h
index 7b4c84dad..70d71259b 100644
--- a/nx-X11/lib/X11/cursorfont.h
+++ b/nx-X11/lib/X11/cursorfont.h
@@ -26,6 +26,9 @@ from The Open Group.
 
 */
 
+#ifndef _cursorfont_h_
+#define _cursorfont_h_
+
 #define XC_num_glyphs 154
 #define XC_X_cursor 0
 #define XC_arrow 2
@@ -104,3 +107,5 @@ from The Open Group.
 #define XC_ur_angle 148
 #define XC_watch 150
 #define XC_xterm 152
+
+#endif /* _cursorfont_h_ */