diff options
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbconfig.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbconfig.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbconfig.c b/nx-X11/programs/Xserver/xkb/xkbconfig.c index dce86bc15..de138ef45 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> @@ -54,9 +45,7 @@ #include "misc.h" #include "inputstr.h" #include "dix.h" -#define XKBSRV_NEED_FILE_FUNCS -#include <nx-X11/extensions/XKBsrv.h> -#endif +#include <xkbsrv.h> #include <nx-X11/extensions/XKBconfig.h> @@ -1339,14 +1328,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; } |