diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-03-01 18:09:07 -0800 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:26 +0200 |
| commit | 2393e1acdbf709c5797a37ffca6bfa9093876c0b (patch) | |
| tree | be5a4cfc92b733d0b8d0ff65ac2618055e39eb53 | |
| parent | d31b81c1010b4259bb0caafdbd82483fabda787d (diff) | |
| download | nx-libs-2393e1acdbf709c5797a37ffca6bfa9093876c0b.tar.gz nx-libs-2393e1acdbf709c5797a37ffca6bfa9093876c0b.tar.bz2 nx-libs-2393e1acdbf709c5797a37ffca6bfa9093876c0b.zip | |
unifdef XKB_IN_SERVER
Leftovers from XKB files that were previously shared between the client
and server code, but aren't any more.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| -rw-r--r-- | nx-X11/lib/X11/XKBAlloc.c | 12 | ||||
| -rw-r--r-- | nx-X11/lib/X11/XKBGAlloc.c | 12 | ||||
| -rw-r--r-- | nx-X11/lib/X11/XKBMAlloc.c | 13 | ||||
| -rw-r--r-- | nx-X11/lib/X11/XKBMisc.c | 13 |
4 files changed, 0 insertions, 50 deletions
diff --git a/nx-X11/lib/X11/XKBAlloc.c b/nx-X11/lib/X11/XKBAlloc.c index 995c955cc..937e02fae 100644 --- a/nx-X11/lib/X11/XKBAlloc.c +++ b/nx-X11/lib/X11/XKBAlloc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif -#ifndef XKB_IN_SERVER #include <stdio.h> #include "Xlibint.h" @@ -39,17 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" -#else - -#include <stdio.h> -#include <nx-X11/X.h> -#include <nx-X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include <nx-X11/extensions/XKBsrv.h> -#include <nx-X11/extensions/XKBgeom.h> - -#endif /* XKB_IN_SERVER */ /***===================================================================***/ diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/X11/XKBGAlloc.c index fa405fb9c..d9682f588 100644 --- a/nx-X11/lib/X11/XKBGAlloc.c +++ b/nx-X11/lib/X11/XKBGAlloc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif -#ifndef XKB_IN_SERVER #include <stdio.h> #include "Xlibint.h" @@ -38,17 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBproto.h> -#else - -#include <stdio.h> -#include <nx-X11/X.h> -#include <nx-X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include <nx-X11/extensions/XKBsrv.h> -#include <nx-X11/extensions/XKBgeom.h> - -#endif /* XKB_IN_SERVER */ #ifdef X_NOT_POSIX #define Size_t unsigned int diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/X11/XKBMAlloc.c index 594ef7f71..c81540aae 100644 --- a/nx-X11/lib/X11/XKBMAlloc.c +++ b/nx-X11/lib/X11/XKBMAlloc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif -#ifndef XKB_IN_SERVER #include <stdio.h> #include "Xlibint.h" @@ -38,18 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/keysym.h> #include "XKBlibint.h" -#else - -#include <stdio.h> -#include <nx-X11/X.h> -#include <nx-X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include <nx-X11/keysym.h> -#define XKBSRV_NEED_FILE_FUNCS -#include <nx-X11/extensions/XKBsrv.h> - -#endif /* XKB_IN_SERVER */ /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBMisc.c b/nx-X11/lib/X11/XKBMisc.c index ea6bd4518..4a12946e0 100644 --- a/nx-X11/lib/X11/XKBMisc.c +++ b/nx-X11/lib/X11/XKBMisc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif -#ifndef XKB_IN_SERVER #include <stdio.h> #include "Xlibint.h" @@ -38,18 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/keysym.h> #include "XKBlibint.h" -#else - -#include <stdio.h> -#include <nx-X11/X.h> -#include <nx-X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include <nx-X11/keysym.h> -#define XKBSRV_NEED_FILE_FUNCS -#include <nx-X11/extensions/XKBsrv.h> - -#endif /* XKB_IN_SERVER */ /***====================================================================***/ |