diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-09-26 22:20:45 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-06 21:16:17 +0200 |
commit | 2a5364d5ff547e0a2447cbde4cd37da2fe69dece (patch) | |
tree | 89e8d9bee62e64d900f71fb3d832ecf681ff6584 /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
parent | 7c5d836c2d672a2eb84c3570d88a0d439140083d (diff) | |
download | nx-libs-2a5364d5ff547e0a2447cbde4cd37da2fe69dece.tar.gz nx-libs-2a5364d5ff547e0a2447cbde4cd37da2fe69dece.tar.bz2 nx-libs-2a5364d5ff547e0a2447cbde4cd37da2fe69dece.zip |
xserver: drop XKBSRV_NEED_FILE_FUNCS
just as upstream did
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 3bff638fb..5cb4ff4d9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -73,12 +73,14 @@ is" without express or implied warranty. #include <nx-X11/extensions/XKB.h> -#define XKBSRV_NEED_FILE_FUNCS +/* + we need the client side header here, xkbsrv.h will not work because + server and libX11 have different struct sizes on + 64bit. Interestingly upstream xnest does not take care of this. +*/ #include <nx-X11/extensions/XKBsrv.h> #include <nx-X11/extensions/XKBconfig.h> -#include <nx-X11/extensions/XKBrules.h> - #include "Xatom.h" #include <errno.h> |