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/dix | |
| 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/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/events.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index f02da7d21..39f5d123f 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -61,9 +61,8 @@ SOFTWARE. #include "cursorstr.h" #include "dixstruct.h" #include "site.h" -#define XKB_IN_SERVER #ifdef XKB -#include <nx-X11/extensions/XKBsrv.h> +#include "xkbsrv.h" #endif #ifdef XCSECURITY #define _SECURITY_SERVER diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 3017c68d1..d098afdc8 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -109,9 +109,8 @@ int ProcInitialConnection(); #include <nx-X11/extensions/security.h> #endif #ifdef XKB -#define XKB_IN_SERVER #include "inputstr.h" -#include <nx-X11/extensions/XKBsrv.h> +#include "xkbsrv.h" #endif #define mskcnt ((MAXCLIENTS + 31) / 32) diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index f85bacdd3..166d2e85e 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -129,7 +129,7 @@ of the copyright holder. #include "globals.h" #ifdef XKB -#include <nx-X11/extensions/XKBsrv.h> +#include "xkbsrv.h" extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif |