diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 00:55:13 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 00:55:13 +0100 |
| commit | 1918bcb9c01fcf45727b514afb8ca8d978a2bf93 (patch) | |
| tree | a678fc2c488d1f8121cc736575e682541f465e95 /nx-X11/programs/Xserver/xkb/XKBAlloc.c | |
| parent | a6cb8583adb16f299e968be4a8e99e903966e1d8 (diff) | |
| parent | 00e3e95e5f40de2aaf5bb920bc51a311404889fc (diff) | |
| download | nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.gz nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.bz2 nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.zip | |
Merge branch 'uli42-pr/update_xkb' into 3.6.x
Attributes GH PR #648: https://github.com/ArcticaProject/nx-libs/pull/648
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/XKBAlloc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/XKBAlloc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/XKBAlloc.c b/nx-X11/programs/Xserver/xkb/XKBAlloc.c index bc0206f8e..4fe4960a3 100644 --- a/nx-X11/programs/Xserver/xkb/XKBAlloc.c +++ b/nx-X11/programs/Xserver/xkb/XKBAlloc.c @@ -26,11 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#elif defined(HAVE_CONFIG_H) -#include <config.h> #endif - #include <stdio.h> #include <nx-X11/X.h> #include <nx-X11/Xproto.h> @@ -39,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include "xkbgeom.h" - /***===================================================================***/ /*ARGSUSED*/ |