diff options
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkmread.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkmread.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index 1ceccc9bb..18ab21dca 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -35,29 +35,15 @@ #include <nx-X11/Xos.h> #include <nx-X11/Xfuncs.h> -#ifndef XKB_IN_SERVER - -#include <stdlib.h> -#include <nx-X11/Xlib.h> -#include <nx-X11/keysym.h> - -#include <nx-X11/XKBlib.h> - -#include <nx-X11/extensions/XKBgeom.h> -#include "XKMformat.h" -#include "XKBfileInt.h" - -#else #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include <nx-X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include <nx-X11/extensions/XKBstr.h> -#define XKBSRV_NEED_FILE_FUNCS -#include <nx-X11/extensions/XKBsrv.h> -#include <nx-X11/extensions/XKBgeom.h> +#include "xkbstr.h" +#include "xkbsrv.h" +#include "xkbgeom.h" Atom XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) @@ -67,7 +53,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) return MakeAtom(str,strlen(str),!only_if_exists); } -#endif #ifndef SEEK_SET #define SEEK_SET 0 |