From 3739a9b3033ccaf139a296f8647f7c6cddc9db75 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller <uli42@gmx.de> 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/devices.c | 2 +- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- nx-X11/programs/Xserver/dix/events.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index f02da7d21..1c4e71f23 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -63,7 +63,7 @@ SOFTWARE. #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..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 <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..c0ddfe67b 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 -- cgit v1.2.3 From 7c5d836c2d672a2eb84c3570d88a0d439140083d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller <uli42@gmx.de> 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/devices.c | 1 - nx-X11/programs/Xserver/dix/dispatch.c | 1 - 2 files changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 1c4e71f23..53ba83bed 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -61,7 +61,6 @@ SOFTWARE. #include "cursorstr.h" #include "dixstruct.h" #include "site.h" -#define XKB_IN_SERVER #ifdef XKB #include <xkbsrv.h> #endif 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 <nx-X11/extensions/security.h> #endif #ifdef XKB -#define XKB_IN_SERVER #include "inputstr.h" #include <xkbsrv.h> #endif -- cgit v1.2.3 From 736a2333e655ecfee78cb82f074cce5e84bdc218 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller <uli42@gmx.de> Date: Tue, 4 Oct 2016 21:24:56 +0200 Subject: xserver: adapt xkbsrc includes syntax to match upstream --- nx-X11/programs/Xserver/dix/devices.c | 2 +- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- nx-X11/programs/Xserver/dix/events.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 53ba83bed..39f5d123f 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -62,7 +62,7 @@ SOFTWARE. #include "dixstruct.h" #include "site.h" #ifdef XKB -#include <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 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 <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 c0ddfe67b..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 <xkbsrv.h> +#include "xkbsrv.h" extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif -- cgit v1.2.3