diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-10-20 01:01:37 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-10-28 20:28:56 -0700 |
| commit | 7544a9eb35d5850ae2e68d8cdab50f25ce7cd5d9 (patch) | |
| tree | cbd9d1920342feb8bfa6ca2f8b19c40c8b87f140 /src/xkmread.c | |
| parent | a945540e6eea9b9303c8f611412ecb58129180e7 (diff) | |
unifdef -UXKB_IN_SERVER
Xserver has its own copy of this code now, so we don't need to keep
an unused copy in libxkbfile too.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkmread.c')
| -rw-r--r-- | src/xkmread.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/xkmread.c b/src/xkmread.c index 55a4436..7c88241 100644 --- a/src/xkmread.c +++ b/src/xkmread.c @@ -35,7 +35,6 @@ #include <X11/Xos.h> #include <X11/Xfuncs.h> -#ifndef XKB_IN_SERVER #include <stdlib.h> #include <X11/Xlib.h> @@ -47,27 +46,6 @@ #include "XKMformat.h" #include "XKBfileInt.h" -#else - -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include "misc.h" -#include "inputstr.h" -#include <X11/extensions/XKBstr.h> -#define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> - -Atom -XkbInternAtom(Display * dpy, char *str, Bool only_if_exists) -{ - if (str == NULL) - return None; - return MakeAtom(str, strlen(str), !only_if_exists); -} - -#endif #ifndef SEEK_SET #define SEEK_SET 0 |