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/xkb/xkbUtils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index 148fe1d66..759c2529c 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include +#include #include #include "xkb.h" -- cgit v1.2.3 From 2fdb1add03d6e5cff06ee5d9eb4aa89b3736c66c Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Sep 2016 21:12:23 +0200 Subject: xserver: use own copy of XKBgeom.h header just like upstream does --- nx-X11/programs/Xserver/xkb/xkbUtils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index 759c2529c..014e0f86a 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XKBSRV_NEED_FILE_FUNCS #include -#include +#include "xkbgeom.h" #include "xkb.h" #ifdef MODE_SWITCH -- cgit v1.2.3 From 2a5364d5ff547e0a2447cbde4cd37da2fe69dece Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Sep 2016 22:20:45 +0200 Subject: xserver: drop XKBSRV_NEED_FILE_FUNCS just as upstream did --- nx-X11/programs/Xserver/xkb/xkbUtils.c | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index 014e0f86a..b6a845c18 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "misc.h" #include "inputstr.h" -#define XKBSRV_NEED_FILE_FUNCS #include #include "xkbgeom.h" #include "xkb.h" -- cgit v1.2.3