diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-07 21:38:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-07 21:38:18 +0200 |
| commit | 3039a34cbd8716766391fe7de5ea002f643bf143 (patch) | |
| tree | 3dedb91af3a6a473d05b516eb7881065ca397ab7 /nx-X11/programs/Xserver/xkb/xkb.c | |
| parent | 168c063dcaa8b60a3b6e3e1132416841d48419ea (diff) | |
| parent | 736a2333e655ecfee78cb82f074cce5e84bdc218 (diff) | |
| download | nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.tar.gz nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.tar.bz2 nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.zip | |
Merge branch 'uli42-pr/decouple-xserver' into 3.6.x
Attributes GH PR #208: https://github.com/ArcticaProject/nx-libs/pull/208
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkb.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 8433aeb23..3e4cf4acd 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -33,8 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#define XKBSRV_NEED_FILE_FUNCS -#include <nx-X11/extensions/XKBsrv.h> +#include <xkbsrv.h> #include "extnsionst.h" #include "xkb.h" #include "protocol-versions.h" @@ -3880,7 +3879,7 @@ ProcXkbSetNames(ClientPtr client) /***====================================================================***/ -#include <nx-X11/extensions/XKBgeom.h> +#include "xkbgeom.h" #define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) |