From 3739a9b3033ccaf139a296f8647f7c6cddc9db75 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Sep 2016 20:43:23 +0200 Subject: xserver: use own copy of XKBsrv.h header just like upstream does --- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dix/dispatch.c') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 3017c68d1..87d753612 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -111,7 +111,7 @@ int ProcInitialConnection(); #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include +#include #endif #define mskcnt ((MAXCLIENTS + 31) / 32) -- cgit v1.2.3 From 7c5d836c2d672a2eb84c3570d88a0d439140083d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Sep 2016 21:32:05 +0200 Subject: xserver: remove define XKB_IN_SERVER it is no longer needed because the code here is only used in the server. --- nx-X11/programs/Xserver/dix/dispatch.c | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dix/dispatch.c') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 87d753612..aa647b063 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -109,7 +109,6 @@ int ProcInitialConnection(); #include #endif #ifdef XKB -#define XKB_IN_SERVER #include "inputstr.h" #include #endif -- cgit v1.2.3 From 736a2333e655ecfee78cb82f074cce5e84bdc218 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 4 Oct 2016 21:24:56 +0200 Subject: xserver: adapt xkbsrc includes syntax to match upstream --- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dix/dispatch.c') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index aa647b063..d098afdc8 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -110,7 +110,7 @@ int ProcInitialConnection(); #endif #ifdef XKB #include "inputstr.h" -#include +#include "xkbsrv.h" #endif #define mskcnt ((MAXCLIENTS + 31) / 32) -- cgit v1.2.3