[Xorg] PATCH: fix xkb in KDrive

[jserv at linux2.cc.ntu.edu.tw]

Hello all,

  Since xkb in KDrive was organized, I think the XKB_IN_SERVER
macro seems to be redundant, and I made a small patch to get
xkb support in KDrive working.

  Please consult the attachment to see if the patch is proper.

cheers,
Jim Huang
-------------- next part --------------
Index: xkb/maprules.c
===================================================================
RCS file: /cvs/xserver/xserver/xkb/maprules.c,v
retrieving revision 1.1
diff -u -r1.1 maprules.c
--- xkb/maprules.c	25 Apr 2004 13:52:20 -0000	1.1
+++ xkb/maprules.c	11 Aug 2004 12:42:01 -0000
@@ -34,8 +34,6 @@
 #define XOS_USE_NO_LOCKING
 #include <X11/Xos_r.h>
 
-#ifndef XKB_IN_SERVER
-
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
@@ -47,8 +45,9 @@
 #include <X11/extensions/XKMformat.h>
 #include <X11/extensions/XKBfileInt.h>
 #include <X11/extensions/XKBrules.h>
+#include <X11/extensions/XKBsrv.h>
 
-#else
+#if 0
 
 #define NEED_EVENTS
 #include <X11/Xproto.h>