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/os/utils.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/os/utils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index a6982a3e2..8c69b1346 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -90,6 +90,9 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include "misc.h" #include <nx-X11/X.h> +#define XSERV_t +#define TRANS_SERVER +#define TRANS_REOPEN #include <nx-X11/Xtrans/Xtrans.h> #include "input.h" #include "dixfont.h" @@ -141,7 +144,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XKB -#include <nx-X11/extensions/XKBsrv.h> +#include "xkbsrv.h" #endif #ifdef XCSECURITY #define _SECURITY_SERVER |