diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-09-26 21:32:05 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-06 21:16:17 +0200 |
| commit | 7c5d836c2d672a2eb84c3570d88a0d439140083d (patch) | |
| tree | e319211818c860e34bb57927d4d303e273675ea5 /nx-X11/programs/Xserver/xkb/xkbconfig.c | |
| parent | 2fdb1add03d6e5cff06ee5d9eb4aa89b3736c66c (diff) | |
| download | nx-libs-7c5d836c2d672a2eb84c3570d88a0d439140083d.tar.gz nx-libs-7c5d836c2d672a2eb84c3570d88a0d439140083d.tar.bz2 nx-libs-7c5d836c2d672a2eb84c3570d88a0d439140083d.zip | |
xserver: remove define XKB_IN_SERVER
it is no longer needed because the code here is only used in the server.
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbconfig.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbconfig.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbconfig.c b/nx-X11/programs/Xserver/xkb/xkbconfig.c index 525a65ce8..b795dddb2 100644 --- a/nx-X11/programs/Xserver/xkb/xkbconfig.c +++ b/nx-X11/programs/Xserver/xkb/xkbconfig.c @@ -38,15 +38,6 @@ #include <nx-X11/Xfuncs.h> -#ifndef XKB_IN_SERVER - -#include <nx-X11/Xos.h> -#include <nx-X11/Xlib.h> -#include <nx-X11/keysym.h> -#include <nx-X11/XKBlib.h> -#include "XKBfileInt.h" - -#else #include <nx-X11/X.h> #include <nx-X11/keysym.h> @@ -56,7 +47,6 @@ #include "dix.h" #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> -#endif #include <nx-X11/extensions/XKBconfig.h> @@ -1339,14 +1329,8 @@ char * msg; default: msg= "unknown error on line %d"; break; } -#ifndef XKB_IN_SERVER - fprintf(file,msg,line); - if (name) fprintf(file," of %s\n",name); - else fprintf(file,"\n"); -#else ErrorF(msg,line); if (name) ErrorF(" of %s\n",name); else ErrorF("\n"); -#endif return; } |