Lift xkb to XORG-1.2.0 state

2 files changed, 19 insertions, 16 deletions

diff --git a/nx-X11/programs/Xserver/include/xkbfile.h b/nx-X11/programs/Xserver/include/xkbfile.h
index e99de6c9c..2b0224400 100644
--- a/nx-X11/programs/Xserver/include/xkbfile.h
+++ b/nx-X11/programs/Xserver/include/xkbfile.h
@@ -10,19 +10,19 @@
  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.
 
@@ -83,9 +83,9 @@ typedef void	(*XkbFileAddOnFunc)(
 #define	_XkbErrXReqFailure		25
 #define	_XkbErrBadImplementation	26
 
-extern char *		_XkbErrMessages[];
+extern const char *	_XkbErrMessages[];
 extern unsigned		_XkbErrCode;
-extern char *		_XkbErrLocation;
+extern const char *	_XkbErrLocation;
 extern unsigned		_XkbErrData;
 
 /***====================================================================***/
@@ -233,12 +233,14 @@ extern	Bool	XkbLookupGroupAndLevel(
 
 /***====================================================================***/
 
-
-/***====================================================================***/
+extern	char *	XkbAtomGetString(
+    Display *	/* dpy */,
+    Atom 	/* atm */
+);
 
 extern	Atom	XkbInternAtom(
     Display *	/* dpy */,
-    char *	/* name */,
+    char *      /* name */,
     Bool	/* onlyIfExists */
 );
 
@@ -272,7 +274,7 @@ typedef struct _XkbDrawable {
 	    XkbSectionPtr	section;
 	} u;
 	struct _XkbDrawable *	next;
-} XkbDrawableRec,*XkbDrawablePtr; 
+} XkbDrawableRec,*XkbDrawablePtr;
 
 extern	XkbDrawablePtr
 XkbGetOrderedDrawables(
diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h
index 9f9ccc5c3..a3f8718cb 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -267,7 +267,8 @@ extern int	XkbEventBase;
 extern int	XkbDisableLockActions;
 extern char *	XkbBaseDirectory;
 extern char *	XkbBinDirectory;
-extern char *	XkbInitialMap;
+extern int	_XkbClientMajor;
+extern int	_XkbClientMinor;
 extern unsigned	int XkbXIUnsupported;
 
 extern Bool	noXkbExtension;