diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
| commit | ca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch) | |
| tree | 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/lib/xkbfile/xkbmisc.c | |
| parent | f58006d932d907dc13d76084e9171de59ee27f16 (diff) | |
| parent | 433d8186588698ce6a435fbff5e9d40a37b78be9 (diff) | |
| download | nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2 nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip | |
Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x
Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
Diffstat (limited to 'nx-X11/lib/xkbfile/xkbmisc.c')
| -rw-r--r-- | nx-X11/lib/xkbfile/xkbmisc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/lib/xkbfile/xkbmisc.c b/nx-X11/lib/xkbfile/xkbmisc.c index cca31f778..52fca3d10 100644 --- a/nx-X11/lib/xkbfile/xkbmisc.c +++ b/nx-X11/lib/xkbfile/xkbmisc.c @@ -36,31 +36,31 @@ #include <ctype.h> #include <stdlib.h> -#include <X11/Xos.h> -#include <X11/Xfuncs.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xfuncs.h> #ifndef XKB_IN_SERVER -#include <X11/Xlib.h> -#include <X11/keysym.h> -#include <X11/XKBlib.h> -#include <X11/extensions/XKBgeom.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/keysym.h> +#include <nx-X11/XKBlib.h> +#include <nx-X11/extensions/XKBgeom.h> #include "XKMformat.h" #include "XKBfileInt.h" #else -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS -#include <X11/keysym.h> -#include <X11/Xproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" #include "dix.h" -#include <X11/extensions/XKBstr.h> +#include <nx-X11/extensions/XKBstr.h> #define XKBSRV_NEED_FILE_FUNCS 1 -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBgeom.h> #include "xkb.h" #endif |