aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/xkbfile
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/lib/xkbfile')
-rw-r--r--nx-X11/lib/xkbfile/Imakefile2
-rw-r--r--nx-X11/lib/xkbfile/XKMformat.h6
-rw-r--r--nx-X11/lib/xkbfile/cout.c8
-rw-r--r--nx-X11/lib/xkbfile/maprules.c34
-rw-r--r--nx-X11/lib/xkbfile/srvmisc.c6
-rw-r--r--nx-X11/lib/xkbfile/xkbatom.c6
-rw-r--r--nx-X11/lib/xkbfile/xkbbells.c4
-rw-r--r--nx-X11/lib/xkbfile/xkbconfig.c22
-rw-r--r--nx-X11/lib/xkbfile/xkbdraw.c12
-rw-r--r--nx-X11/lib/xkbfile/xkbmisc.c24
-rw-r--r--nx-X11/lib/xkbfile/xkbout.c22
-rw-r--r--nx-X11/lib/xkbfile/xkbtext.c18
-rw-r--r--nx-X11/lib/xkbfile/xkmout.c8
-rw-r--r--nx-X11/lib/xkbfile/xkmread.c24
14 files changed, 98 insertions, 98 deletions
diff --git a/nx-X11/lib/xkbfile/Imakefile b/nx-X11/lib/xkbfile/Imakefile
index d7693819e..6a675dc9a 100644
--- a/nx-X11/lib/xkbfile/Imakefile
+++ b/nx-X11/lib/xkbfile/Imakefile
@@ -13,7 +13,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
#define HasSharedData NO
#define LibName NX_xkbfile
#define SoRev SOXKBFILEREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
#define IncSubSubdir extensions
#ifdef SharedxkbfileReqs
diff --git a/nx-X11/lib/xkbfile/XKMformat.h b/nx-X11/lib/xkbfile/XKMformat.h
index 154da5694..ced5ea21d 100644
--- a/nx-X11/lib/xkbfile/XKMformat.h
+++ b/nx-X11/lib/xkbfile/XKMformat.h
@@ -29,9 +29,9 @@
#ifndef _XKMFORMAT_H_
#define _XKMFORMAT_H_ 1
-#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBproto.h>
-#include <X11/extensions/XKM.h>
+#include <nx-X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKM.h>
typedef struct _xkmFileInfo {
CARD8 type;
diff --git a/nx-X11/lib/xkbfile/cout.c b/nx-X11/lib/xkbfile/cout.c
index 161bd0f89..96b3ba411 100644
--- a/nx-X11/lib/xkbfile/cout.c
+++ b/nx-X11/lib/xkbfile/cout.c
@@ -32,10 +32,10 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
#include "XKMformat.h"
#include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/maprules.c b/nx-X11/lib/xkbfile/maprules.c
index 53decdcad..75baf07ea 100644
--- a/nx-X11/lib/xkbfile/maprules.c
+++ b/nx-X11/lib/xkbfile/maprules.c
@@ -38,18 +38,18 @@
#define X_INCLUDE_STRING_H
#define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
#ifndef XKB_IN_SERVER
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
#include "XKMformat.h"
#include "XKBfileInt.h"
#include "XKBrules.h"
@@ -57,18 +57,18 @@
#else
#define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/keysym.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
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
#endif
diff --git a/nx-X11/lib/xkbfile/srvmisc.c b/nx-X11/lib/xkbfile/srvmisc.c
index 3e4c73c98..d228389d9 100644
--- a/nx-X11/lib/xkbfile/srvmisc.c
+++ b/nx-X11/lib/xkbfile/srvmisc.c
@@ -32,9 +32,9 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
#include "XKMformat.h"
#include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkbatom.c b/nx-X11/lib/xkbfile/xkbatom.c
index 1a5dea0f8..d023d5410 100644
--- a/nx-X11/lib/xkbfile/xkbatom.c
+++ b/nx-X11/lib/xkbfile/xkbatom.c
@@ -79,9 +79,9 @@ SOFTWARE.
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
#include "XKMformat.h"
#include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkbbells.c b/nx-X11/lib/xkbfile/xkbbells.c
index 30b918fb4..8bf0885fe 100644
--- a/nx-X11/lib/xkbfile/xkbbells.c
+++ b/nx-X11/lib/xkbfile/xkbbells.c
@@ -29,8 +29,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
#include "XKBbells.h"
static char *_xkbStdBellNames[XkbBI_NumBells] = {
diff --git a/nx-X11/lib/xkbfile/xkbconfig.c b/nx-X11/lib/xkbfile/xkbconfig.c
index 7930979eb..8c31213a5 100644
--- a/nx-X11/lib/xkbfile/xkbconfig.c
+++ b/nx-X11/lib/xkbfile/xkbconfig.c
@@ -36,32 +36,32 @@
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
#ifndef XKB_IN_SERVER
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.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"
#define XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
#endif
-#include <X11/extensions/XKBconfig.h>
+#include <nx-X11/extensions/XKBconfig.h>
/***====================================================================***/
diff --git a/nx-X11/lib/xkbfile/xkbdraw.c b/nx-X11/lib/xkbfile/xkbdraw.c
index c955f0321..865b2952e 100644
--- a/nx-X11/lib/xkbfile/xkbdraw.c
+++ b/nx-X11/lib/xkbfile/xkbdraw.c
@@ -33,12 +33,12 @@
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.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"
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
diff --git a/nx-X11/lib/xkbfile/xkbout.c b/nx-X11/lib/xkbfile/xkbout.c
index b69fdfbb4..8baf34b78 100644
--- a/nx-X11/lib/xkbfile/xkbout.c
+++ b/nx-X11/lib/xkbfile/xkbout.c
@@ -35,32 +35,32 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
#ifndef XKB_IN_SERVER
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.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 <nx-X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBfile.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBfile.h>
#endif
diff --git a/nx-X11/lib/xkbfile/xkbtext.c b/nx-X11/lib/xkbfile/xkbtext.c
index 28592d242..41f2a8ff3 100644
--- a/nx-X11/lib/xkbfile/xkbtext.c
+++ b/nx-X11/lib/xkbfile/xkbtext.c
@@ -36,29 +36,29 @@
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
#ifndef XKB_IN_SERVER
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.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/Xproto.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>
#endif
diff --git a/nx-X11/lib/xkbfile/xkmout.c b/nx-X11/lib/xkbfile/xkmout.c
index 403e48810..7de4081af 100644
--- a/nx-X11/lib/xkbfile/xkmout.c
+++ b/nx-X11/lib/xkbfile/xkmout.c
@@ -32,10 +32,10 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
#include "XKMformat.h"
#include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkmread.c b/nx-X11/lib/xkbfile/xkmread.c
index f22941f67..92ef05b86 100644
--- a/nx-X11/lib/xkbfile/xkmread.c
+++ b/nx-X11/lib/xkbfile/xkmread.c
@@ -34,33 +34,33 @@
#include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
#ifndef XKB_IN_SERVER
#include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.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/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
Atom
XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 20:53:53 +0000