diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-07-08 16:16:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:15:24 +0100 |
| commit | 433d8186588698ce6a435fbff5e9d40a37b78be9 (patch) | |
| tree | 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/lib | |
| parent | f58006d932d907dc13d76084e9171de59ee27f16 (diff) | |
| download | nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.tar.gz nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.tar.bz2 nx-libs-433d8186588698ce6a435fbff5e9d40a37b78be9.zip | |
Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).
In the process of building nxagent against more and more system-wide installed
X.org libraries, we come to the limit of including structs from this (bundled
nx-X11) and that (system-wide X.Org) library.
This commit introduces a clear namespace separation of headers provided by
nx-X11 and headers provided by X.Org. This approach is only temporary as we
want to drop all nx-X11 bundled libraries from nx-libs.
However, for a while we need to make this separation clear and also ship
some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
symbols at the same time.
This patch has been tested on Debian jessie and unstable and requires no
overall testing on various distros and distro versions, as we finally will
drop all libNX_X* libraries and build against X.org's client libs.
For now, this hack eases our development / cleanup process.
Diffstat (limited to 'nx-X11/lib')
183 files changed, 512 insertions, 512 deletions
diff --git a/nx-X11/lib/X11/ClDisplay.c b/nx-X11/lib/X11/ClDisplay.c index b7a58751e..dfbc2f518 100644 --- a/nx-X11/lib/X11/ClDisplay.c +++ b/nx-X11/lib/X11/ClDisplay.c @@ -32,7 +32,7 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "Xlib.h" #include "Xlibint.h" #include "Xintconn.h" diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c index 30146a9f1..177ff2c59 100644 --- a/nx-X11/lib/X11/ConnDis.c +++ b/nx-X11/lib/X11/ConnDis.c @@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xtrans/Xtrans.h> -#include <X11/Xauth.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/Xauth.h> #include <X11/Xdmcp.h> #include <stdio.h> #include <ctype.h> @@ -68,7 +68,7 @@ in this Software without prior written authorization from The Open Group. #include <socket.h> #endif #else -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif #ifndef X_CONNECTION_RETRIES /* number retries on ECONNREFUSED */ diff --git a/nx-X11/lib/X11/ErrDes.c b/nx-X11/lib/X11/ErrDes.c index 16183e85e..64373ffd0 100644 --- a/nx-X11/lib/X11/ErrDes.c +++ b/nx-X11/lib/X11/ErrDes.c @@ -55,7 +55,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xresource.h" #include <stdio.h> diff --git a/nx-X11/lib/X11/FSWrap.c b/nx-X11/lib/X11/FSWrap.c index d40f3b035..77dd3b59c 100644 --- a/nx-X11/lib/X11/FSWrap.c +++ b/nx-X11/lib/X11/FSWrap.c @@ -64,7 +64,7 @@ from The Open Group. #include "Xlibint.h" #include "Xlcint.h" #include <ctype.h> -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #define XMAXLIST 256 diff --git a/nx-X11/lib/X11/FetchName.c b/nx-X11/lib/X11/FetchName.c index 3d41472f3..216c7453d 100644 --- a/nx-X11/lib/X11/FetchName.c +++ b/nx-X11/lib/X11/FetchName.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> #include <stdio.h> diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c index 92a6a8f4a..8c8d1e443 100644 --- a/nx-X11/lib/X11/Font.c +++ b/nx-X11/lib/X11/Font.c @@ -47,7 +47,7 @@ authorization from the X Consortium and the XFree86 Project. #include <stdio.h> #include <stdlib.h> -#include <X11/extensions/xf86bigfstr.h> +#include <nx-X11/extensions/xf86bigfstr.h> #endif #include "Xlcint.h" diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/X11/GetDflt.c index 8a8563379..a881f1c28 100644 --- a/nx-X11/lib/X11/GetDflt.c +++ b/nx-X11/lib/X11/GetDflt.c @@ -52,8 +52,8 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xos.h> -#include <X11/Xresource.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xresource.h> #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE @@ -80,12 +80,12 @@ SOFTWARE. #endif #ifdef XTHREADS -#include <X11/Xthreads.h> +#include <nx-X11/Xthreads.h> #endif #ifndef WIN32 #define X_INCLUDE_PWD_H #define XOS_USE_XLIB_LOCKING -#include <X11/Xos_r.h> +#include <nx-X11/Xos_r.h> #endif #include <stdio.h> #include <ctype.h> diff --git a/nx-X11/lib/X11/GetHints.c b/nx-X11/lib/X11/GetHints.c index 4faccb624..2c4d49d61 100644 --- a/nx-X11/lib/X11/GetHints.c +++ b/nx-X11/lib/X11/GetHints.c @@ -51,11 +51,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xos.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #include <stdio.h> Status XGetSizeHints (dpy, w, hints, property) diff --git a/nx-X11/lib/X11/GetImage.c b/nx-X11/lib/X11/GetImage.c index ffe9d226f..634910d79 100644 --- a/nx-X11/lib/X11/GetImage.c +++ b/nx-X11/lib/X11/GetImage.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xutil.h> /* for XDestroyImage */ +#include <nx-X11/Xutil.h> /* for XDestroyImage */ #include "ImUtil.h" #define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad)) diff --git a/nx-X11/lib/X11/GetNrmHint.c b/nx-X11/lib/X11/GetNrmHint.c index 9dcb7c403..c770df43d 100644 --- a/nx-X11/lib/X11/GetNrmHint.c +++ b/nx-X11/lib/X11/GetNrmHint.c @@ -55,10 +55,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> #include "Xatomtype.h" -#include <X11/Xutil.h> +#include <nx-X11/Xutil.h> #include <stdio.h> Status XGetWMSizeHints (dpy, w, hints, supplied, property) diff --git a/nx-X11/lib/X11/GetRGBCMap.c b/nx-X11/lib/X11/GetRGBCMap.c index 6657c539a..4df3ccced 100644 --- a/nx-X11/lib/X11/GetRGBCMap.c +++ b/nx-X11/lib/X11/GetRGBCMap.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> Status XGetRGBColormaps (dpy, w, stdcmap, count, property) Display *dpy; diff --git a/nx-X11/lib/X11/GetStCmap.c b/nx-X11/lib/X11/GetStCmap.c index 5c8c37e78..ae085aa87 100644 --- a/nx-X11/lib/X11/GetStCmap.c +++ b/nx-X11/lib/X11/GetStCmap.c @@ -50,10 +50,10 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> /* * WARNING diff --git a/nx-X11/lib/X11/GetTxtProp.c b/nx-X11/lib/X11/GetTxtProp.c index 0d4474253..dbff8abc8 100644 --- a/nx-X11/lib/X11/GetTxtProp.c +++ b/nx-X11/lib/X11/GetTxtProp.c @@ -52,10 +52,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xutil.h> -#include <X11/Xos.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xos.h> #include <stdio.h> Status XGetTextProperty (display, window, tp, property) diff --git a/nx-X11/lib/X11/GetWMCMapW.c b/nx-X11/lib/X11/GetWMCMapW.c index 6d5c73c85..496efd208 100644 --- a/nx-X11/lib/X11/GetWMCMapW.c +++ b/nx-X11/lib/X11/GetWMCMapW.c @@ -51,7 +51,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #include <stdio.h> Status XGetWMColormapWindows (dpy, w, colormapWindows, countReturn) diff --git a/nx-X11/lib/X11/GetWMProto.c b/nx-X11/lib/X11/GetWMProto.c index 9b244ce6a..8584a4214 100644 --- a/nx-X11/lib/X11/GetWMProto.c +++ b/nx-X11/lib/X11/GetWMProto.c @@ -51,7 +51,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #include <stdio.h> Status XGetWMProtocols (dpy, w, protocols, countReturn) diff --git a/nx-X11/lib/X11/HVC.c b/nx-X11/lib/X11/HVC.c index 79241fb7a..84fac58b9 100644 --- a/nx-X11/lib/X11/HVC.c +++ b/nx-X11/lib/X11/HVC.c @@ -55,7 +55,7 @@ #endif #include "Xlibint.h" #include "Xcmsint.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <math.h> #include "Cv.h" diff --git a/nx-X11/lib/X11/Iconify.c b/nx-X11/lib/X11/Iconify.c index 62e57b84e..e68508666 100644 --- a/nx-X11/lib/X11/Iconify.c +++ b/nx-X11/lib/X11/Iconify.c @@ -54,10 +54,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xutil.h> #include <stdio.h> /* diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c index 85f4183f4..2be839928 100644 --- a/nx-X11/lib/X11/ImUtil.c +++ b/nx-X11/lib/X11/ImUtil.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include <stdio.h> #include "ImUtil.h" diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 212216f46..81a1cfd3d 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -85,7 +85,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define LibName NX_X11 #define SoRev SOXLIBREV #define HugeLibrary YES -#define IncSubdir X11 +#define IncSubdir nx-X11 #if BuildLoadableXlibI18n SUBDIRS = xlibi18n diff --git a/nx-X11/lib/X11/InitExt.c b/nx-X11/lib/X11/InitExt.c index 67c865787..5aab682c7 100644 --- a/nx-X11/lib/X11/InitExt.c +++ b/nx-X11/lib/X11/InitExt.c @@ -31,8 +31,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xos.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xos.h> #include <stdio.h> /* diff --git a/nx-X11/lib/X11/KeyBind.c b/nx-X11/lib/X11/KeyBind.c index fab9eeacd..d99cfdf2f 100644 --- a/nx-X11/lib/X11/KeyBind.c +++ b/nx-X11/lib/X11/KeyBind.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #define XK_MISCELLANY #define XK_LATIN1 #define XK_LATIN2 @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. #define XK_CAUCASUS #define XK_VIETNAMESE #define XK_XKB_KEYS -#include <X11/keysymdef.h> +#include <nx-X11/keysymdef.h> #include <stdio.h> #ifdef USE_OWN_COMPOSE diff --git a/nx-X11/lib/X11/KeysymStr.c b/nx-X11/lib/X11/KeysymStr.c index 59aa3f32c..b43e2735a 100644 --- a/nx-X11/lib/X11/KeysymStr.c +++ b/nx-X11/lib/X11/KeysymStr.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xresource.h> -#include <X11/keysymdef.h> +#include <nx-X11/Xresource.h> +#include <nx-X11/keysymdef.h> #include <stdio.h> /* sprintf */ diff --git a/nx-X11/lib/X11/LRGB.c b/nx-X11/lib/X11/LRGB.c index e4bc0b500..392c59579 100644 --- a/nx-X11/lib/X11/LRGB.c +++ b/nx-X11/lib/X11/LRGB.c @@ -41,8 +41,8 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xos.h> -#include <X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xatom.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/Lab.c b/nx-X11/lib/X11/Lab.c index 596c137f8..19b3e3a1d 100644 --- a/nx-X11/lib/X11/Lab.c +++ b/nx-X11/lib/X11/Lab.c @@ -42,7 +42,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <stdio.h> /* sscanf */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/nx-X11/lib/X11/Luv.c b/nx-X11/lib/X11/Luv.c index ec94c9e56..206ae1017 100644 --- a/nx-X11/lib/X11/Luv.c +++ b/nx-X11/lib/X11/Luv.c @@ -43,7 +43,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c index e9d019723..67f7ccbd1 100644 --- a/nx-X11/lib/X11/OpenDis.c +++ b/nx-X11/lib/X11/OpenDis.c @@ -50,10 +50,10 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xtrans/Xtrans.h> -#include <X11/Xatom.h> -#include <X11/Xresource.h> -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xresource.h> +#include <nx-X11/extensions/bigreqstr.h> #include <stdio.h> #include "Xintconn.h" diff --git a/nx-X11/lib/X11/ParseCmd.c b/nx-X11/lib/X11/ParseCmd.c index ddcbf7846..fe20f6eff 100644 --- a/nx-X11/lib/X11/ParseCmd.c +++ b/nx-X11/lib/X11/ParseCmd.c @@ -61,7 +61,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xresource.h> +#include <nx-X11/Xresource.h> #include <stdio.h> diff --git a/nx-X11/lib/X11/PolyReg.c b/nx-X11/lib/X11/PolyReg.c index 4b17ec5c5..6e1f7ead8 100644 --- a/nx-X11/lib/X11/PolyReg.c +++ b/nx-X11/lib/X11/PolyReg.c @@ -55,7 +55,7 @@ SOFTWARE. #endif #include "Xlibint.h" #include "Xutil.h" -#include <X11/Xregion.h> +#include <nx-X11/Xregion.h> #include "poly.h" /* diff --git a/nx-X11/lib/X11/Quarks.c b/nx-X11/lib/X11/Quarks.c index d47bce314..a49562aac 100644 --- a/nx-X11/lib/X11/Quarks.c +++ b/nx-X11/lib/X11/Quarks.c @@ -55,7 +55,7 @@ from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xresource.h> +#include <nx-X11/Xresource.h> #include "Xresinternal.h" /* Not cost effective, at least for vanilla MIT clients */ diff --git a/nx-X11/lib/X11/RdBitF.c b/nx-X11/lib/X11/RdBitF.c index 198e0e4a5..97afcc493 100644 --- a/nx-X11/lib/X11/RdBitF.c +++ b/nx-X11/lib/X11/RdBitF.c @@ -47,7 +47,7 @@ from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xutil.h" #include <stdio.h> #include <ctype.h> diff --git a/nx-X11/lib/X11/Region.c b/nx-X11/lib/X11/Region.c index cdd223b25..bef46def0 100644 --- a/nx-X11/lib/X11/Region.c +++ b/nx-X11/lib/X11/Region.c @@ -77,7 +77,7 @@ SOFTWARE. #endif #include "Xlibint.h" #include "Xutil.h" -#include <X11/Xregion.h> +#include <nx-X11/Xregion.h> #include "poly.h" #ifdef DEBUG diff --git a/nx-X11/lib/X11/ScrResStr.c b/nx-X11/lib/X11/ScrResStr.c index 89f771784..7feb3b388 100644 --- a/nx-X11/lib/X11/ScrResStr.c +++ b/nx-X11/lib/X11/ScrResStr.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> char *XScreenResourceString(screen) Screen *screen; diff --git a/nx-X11/lib/X11/SetHints.c b/nx-X11/lib/X11/SetHints.c index 5ee34435d..27b1bedbc 100644 --- a/nx-X11/lib/X11/SetHints.c +++ b/nx-X11/lib/X11/SetHints.c @@ -51,11 +51,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> -#include <X11/Xos.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> #define safestrlen(s) ((s) ? strlen(s) : 0) diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index bb4f850e3..875718dca 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -63,8 +63,8 @@ from The Open Group. #endif #include "Xlibint.h" #include "Xlcint.h" -#include <X11/Xlocale.h> -#include <X11/Xos.h> +#include <nx-X11/Xlocale.h> +#include <nx-X11/Xos.h> #include "XlcPubI.h" #define MAXLOCALE 64 /* buffer size of locale name */ diff --git a/nx-X11/lib/X11/SetNrmHint.c b/nx-X11/lib/X11/SetNrmHint.c index 64b0ef7f3..e8e6daf31 100644 --- a/nx-X11/lib/X11/SetNrmHint.c +++ b/nx-X11/lib/X11/SetNrmHint.c @@ -54,11 +54,11 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> -#include <X11/Xos.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> void XSetWMSizeHints (dpy, w, hints, prop) Display *dpy; diff --git a/nx-X11/lib/X11/SetRGBCMap.c b/nx-X11/lib/X11/SetRGBCMap.c index 4be840b75..03aa9392c 100644 --- a/nx-X11/lib/X11/SetRGBCMap.c +++ b/nx-X11/lib/X11/SetRGBCMap.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> void XSetRGBColormaps (dpy, w, cmaps, count, property) Display *dpy; diff --git a/nx-X11/lib/X11/SetStCmap.c b/nx-X11/lib/X11/SetStCmap.c index b5a93e36e..521b9480d 100644 --- a/nx-X11/lib/X11/SetStCmap.c +++ b/nx-X11/lib/X11/SetStCmap.c @@ -50,10 +50,10 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xatomtype.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> /* * WARNING diff --git a/nx-X11/lib/X11/SetTxtProp.c b/nx-X11/lib/X11/SetTxtProp.c index a82d9b3e3..ae8b81e29 100644 --- a/nx-X11/lib/X11/SetTxtProp.c +++ b/nx-X11/lib/X11/SetTxtProp.c @@ -52,10 +52,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xutil.h> -#include <X11/Xos.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xos.h> #include <stdio.h> void XSetTextProperty (dpy, w, tp, property) diff --git a/nx-X11/lib/X11/SetWMCMapW.c b/nx-X11/lib/X11/SetWMCMapW.c index dd88061da..6774d7326 100644 --- a/nx-X11/lib/X11/SetWMCMapW.c +++ b/nx-X11/lib/X11/SetWMCMapW.c @@ -51,7 +51,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> /* * XSetWMProtocols sets the property diff --git a/nx-X11/lib/X11/SetWMProto.c b/nx-X11/lib/X11/SetWMProto.c index 8640e5060..bc7dcf63c 100644 --- a/nx-X11/lib/X11/SetWMProto.c +++ b/nx-X11/lib/X11/SetWMProto.c @@ -51,7 +51,7 @@ SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> /* * XSetWMProtocols sets the property diff --git a/nx-X11/lib/X11/StBytes.c b/nx-X11/lib/X11/StBytes.c index b23902581..676652678 100644 --- a/nx-X11/lib/X11/StBytes.c +++ b/nx-X11/lib/X11/StBytes.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> /* insulate predefined atom numbers from cut routines */ static Atom n_to_atom[8] = { diff --git a/nx-X11/lib/X11/StName.c b/nx-X11/lib/X11/StName.c index ba01ffb0c..d3053346c 100644 --- a/nx-X11/lib/X11/StName.c +++ b/nx-X11/lib/X11/StName.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> int XStoreName ( diff --git a/nx-X11/lib/X11/StrKeysym.c b/nx-X11/lib/X11/StrKeysym.c index 74ccecbcd..fc1e7a34d 100644 --- a/nx-X11/lib/X11/StrKeysym.c +++ b/nx-X11/lib/X11/StrKeysym.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xresource.h> -#include <X11/keysymdef.h> +#include <nx-X11/Xresource.h> +#include <nx-X11/keysymdef.h> #include "Xresinternal.h" #define NEEDKTABLE diff --git a/nx-X11/lib/X11/StrToText.c b/nx-X11/lib/X11/StrToText.c index ba894e16f..5fd9c6ec6 100644 --- a/nx-X11/lib/X11/StrToText.c +++ b/nx-X11/lib/X11/StrToText.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xutil.h> /* * XStringListToTextProperty - fill in TextProperty structure with diff --git a/nx-X11/lib/X11/TextToStr.c b/nx-X11/lib/X11/TextToStr.c index 0bea8096d..f4c00adcf 100644 --- a/nx-X11/lib/X11/TextToStr.c +++ b/nx-X11/lib/X11/TextToStr.c @@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xutil.h> /* diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/X11/WMProps.c index 62c6a8d12..7a390a9d7 100644 --- a/nx-X11/lib/X11/WMProps.c +++ b/nx-X11/lib/X11/WMProps.c @@ -55,11 +55,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xutil.h> -#include <X11/Xos.h> -#include <X11/Xlocale.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xlocale.h> /* diff --git a/nx-X11/lib/X11/Withdraw.c b/nx-X11/lib/X11/Withdraw.c index 1b771c286..2037b8e46 100644 --- a/nx-X11/lib/X11/Withdraw.c +++ b/nx-X11/lib/X11/Withdraw.c @@ -54,10 +54,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xutil.h> #include <stdio.h> /* diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/X11/WrBitF.c index d8c9f18fa..d48295f0b 100644 --- a/nx-X11/lib/X11/WrBitF.c +++ b/nx-X11/lib/X11/WrBitF.c @@ -32,7 +32,7 @@ from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xutil.h" #include <stdio.h> diff --git a/nx-X11/lib/X11/XDefaultOMIF.c b/nx-X11/lib/X11/XDefaultOMIF.c index 13f0d9cff..b4e63091b 100644 --- a/nx-X11/lib/X11/XDefaultOMIF.c +++ b/nx-X11/lib/X11/XDefaultOMIF.c @@ -49,8 +49,8 @@ Sun Microsystems, Inc. or its licensors is granted. #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" -#include <X11/Xos.h> -#include <X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xatom.h> #include <stdio.h> #define MAXFONTS 100 diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c index ecc5ddf0a..413a51eb6 100644 --- a/nx-X11/lib/X11/XKB.c +++ b/nx-X11/lib/X11/XKB.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" XkbInternAtomFunc _XkbInternAtomFunc= XInternAtom; diff --git a/nx-X11/lib/X11/XKBAlloc.c b/nx-X11/lib/X11/XKBAlloc.c index 9430ac0ed..131985444 100644 --- a/nx-X11/lib/X11/XKBAlloc.c +++ b/nx-X11/lib/X11/XKBAlloc.c @@ -39,21 +39,21 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #include "Xlibint.h" #include "XKBlibint.h" -#include <X11/extensions/XKBgeom.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" #else #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBgeom.h> #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBBell.c b/nx-X11/lib/X11/XKBBell.c index 6ea30855e..51869097e 100644 --- a/nx-X11/lib/X11/XKBBell.c +++ b/nx-X11/lib/X11/XKBBell.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBBind.c b/nx-X11/lib/X11/XKBBind.c index e190d0052..6c1864d41 100644 --- a/nx-X11/lib/X11/XKBBind.c +++ b/nx-X11/lib/X11/XKBBind.c @@ -35,13 +35,13 @@ from The Open Group. #include <config.h> #endif #include "XKBlib.h" -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/keysym.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/keysym.h> #include <stdio.h> #include <ctype.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" #ifdef USE_OWN_COMPOSE diff --git a/nx-X11/lib/X11/XKBCompat.c b/nx-X11/lib/X11/XKBCompat.c index 5886e4d26..b16e6b083 100644 --- a/nx-X11/lib/X11/XKBCompat.c +++ b/nx-X11/lib/X11/XKBCompat.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_MAP_READERS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" Status diff --git a/nx-X11/lib/X11/XKBCtrls.c b/nx-X11/lib/X11/XKBCtrls.c index 0ea131aa0..f3a09a124 100644 --- a/nx-X11/lib/X11/XKBCtrls.c +++ b/nx-X11/lib/X11/XKBCtrls.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c index 1bdf81cd4..2d58ca990 100644 --- a/nx-X11/lib/X11/XKBCvt.c +++ b/nx-X11/lib/X11/XKBCvt.c @@ -35,23 +35,23 @@ from The Open Group. #include <sys/types.h> #include <sys/stat.h> -#include <X11/X.h> -#include <X11/Xlib.h> +#include <nx-X11/X.h> +#include <nx-X11/Xlib.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" #include "XlcPubI.h" #include "Ximint.h" -#include <X11/Xutil.h> -#include <X11/Xmd.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xmd.h> #define XK_LATIN1 #define XK_PUBLISHING -#include <X11/keysym.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" -#include <X11/Xlocale.h> +#include <nx-X11/Xlocale.h> #include <ctype.h> -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #ifdef __sgi_not_xconsortium #define XKB_EXTEND_LOOKUP_STRING diff --git a/nx-X11/lib/X11/XKBExtDev.c b/nx-X11/lib/X11/XKBExtDev.c index 34558e476..0510b7f55 100644 --- a/nx-X11/lib/X11/XKBExtDev.c +++ b/nx-X11/lib/X11/XKBExtDev.c @@ -34,9 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_MAP_READERS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XI.h> /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/X11/XKBGAlloc.c index fddb770b6..eb74cbfd0 100644 --- a/nx-X11/lib/X11/XKBGAlloc.c +++ b/nx-X11/lib/X11/XKBGAlloc.c @@ -40,18 +40,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include "Xlibint.h" #include "XKBlibint.h" -#include <X11/extensions/XKBgeom.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBproto.h> #else #include <stdio.h> -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBgeom.h> #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/X11/XKBGeom.c index 061175489..d225342a7 100644 --- a/nx-X11/lib/X11/XKBGeom.c +++ b/nx-X11/lib/X11/XKBGeom.c @@ -37,8 +37,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_MAP_READERS #include "Xlibint.h" -#include <X11/extensions/XKBgeom.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" #ifndef MINSHORT diff --git a/nx-X11/lib/X11/XKBGetByName.c b/nx-X11/lib/X11/XKBGetByName.c index 2c6ff0849..87f405e50 100644 --- a/nx-X11/lib/X11/XKBGetByName.c +++ b/nx-X11/lib/X11/XKBGetByName.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/X11/XKBGetMap.c index 2b9fb97f4..5f37f9571 100644 --- a/nx-X11/lib/X11/XKBGetMap.c +++ b/nx-X11/lib/X11/XKBGetMap.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" static Status diff --git a/nx-X11/lib/X11/XKBList.c b/nx-X11/lib/X11/XKBList.c index 2f4a53490..ef265fdde 100644 --- a/nx-X11/lib/X11/XKBList.c +++ b/nx-X11/lib/X11/XKBList.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/X11/XKBMAlloc.c index d57d9a58d..31255091f 100644 --- a/nx-X11/lib/X11/XKBMAlloc.c +++ b/nx-X11/lib/X11/XKBMAlloc.c @@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> -#include <X11/keysym.h> +#include <nx-X11/extensions/XKBproto.h> +#include <nx-X11/keysym.h> #include "XKBlibint.h" #else #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include <X11/keysym.h> +#include <nx-X11/keysym.h> #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBMisc.c b/nx-X11/lib/X11/XKBMisc.c index 09f361c19..04ac0c7ea 100644 --- a/nx-X11/lib/X11/XKBMisc.c +++ b/nx-X11/lib/X11/XKBMisc.c @@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> -#include <X11/keysym.h> +#include <nx-X11/extensions/XKBproto.h> +#include <nx-X11/keysym.h> #include "XKBlibint.h" #else #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include <X11/keysym.h> +#include <nx-X11/keysym.h> #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBNames.c b/nx-X11/lib/X11/XKBNames.c index 8483187c3..0bcd42b3d 100644 --- a/nx-X11/lib/X11/XKBNames.c +++ b/nx-X11/lib/X11/XKBNames.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBRdBuf.c b/nx-X11/lib/X11/XKBRdBuf.c index d0b7045d6..109618dd2 100644 --- a/nx-X11/lib/X11/XKBRdBuf.c +++ b/nx-X11/lib/X11/XKBRdBuf.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #include "Xlibint.h" #include "XKBlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBSetGeom.c b/nx-X11/lib/X11/XKBSetGeom.c index e27297c11..f13be8097 100644 --- a/nx-X11/lib/X11/XKBSetGeom.c +++ b/nx-X11/lib/X11/XKBSetGeom.c @@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #include "Xlibint.h" #include "XKBlibint.h" -#include <X11/extensions/XKBgeom.h> -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBproto.h> #ifndef MINSHORT #define MINSHORT -32768 diff --git a/nx-X11/lib/X11/XKBSetMap.c b/nx-X11/lib/X11/XKBSetMap.c index 4a3b15c70..784a241c2 100644 --- a/nx-X11/lib/X11/XKBSetMap.c +++ b/nx-X11/lib/X11/XKBSetMap.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" static int diff --git a/nx-X11/lib/X11/XKBUse.c b/nx-X11/lib/X11/XKBUse.c index ad18bb6fc..95fba49ac 100644 --- a/nx-X11/lib/X11/XKBUse.c +++ b/nx-X11/lib/X11/XKBUse.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" static Bool _XkbIgnoreExtension = False; diff --git a/nx-X11/lib/X11/XKBleds.c b/nx-X11/lib/X11/XKBleds.c index 89ab2e9ec..d026d84be 100644 --- a/nx-X11/lib/X11/XKBleds.c +++ b/nx-X11/lib/X11/XKBleds.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/extensions/XKBproto.h> +#include <nx-X11/extensions/XKBproto.h> #include "XKBlibint.h" Status diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h index 6a5dc8a7c..a1ad7ccea 100644 --- a/nx-X11/lib/X11/XKBlib.h +++ b/nx-X11/lib/X11/XKBlib.h @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBLIB_H_ #define _XKBLIB_H_ -#include <X11/Xlib.h> -#include <X11/extensions/XKBstr.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/extensions/XKBstr.h> typedef struct _XkbAnyEvent { int type; /* XkbAnyEvent */ diff --git a/nx-X11/lib/X11/XKBlibint.h b/nx-X11/lib/X11/XKBlibint.h index 0244e2ef3..9c6352769 100644 --- a/nx-X11/lib/X11/XKBlibint.h +++ b/nx-X11/lib/X11/XKBlibint.h @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBLIBINT_H_ #define _XKBLIBINT_H_ -#include <X11/Xutil.h> -#include <X11/XKBlib.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/XKBlib.h> #define XkbMapPending (1<<0) #define XkbXlibNewKeyboard (1<<1) diff --git a/nx-X11/lib/X11/XYZ.c b/nx-X11/lib/X11/XYZ.c index f5f17f356..5408c4fbc 100644 --- a/nx-X11/lib/X11/XYZ.c +++ b/nx-X11/lib/X11/XYZ.c @@ -38,7 +38,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h index 779bc52ff..8ce81556d 100644 --- a/nx-X11/lib/X11/Xcms.h +++ b/nx-X11/lib/X11/Xcms.h @@ -31,7 +31,7 @@ #ifndef _XCMS_H_ #define _XCMS_H_ -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> /* * XCMS Status Values diff --git a/nx-X11/lib/X11/Xcmsint.h b/nx-X11/lib/X11/Xcmsint.h index 1bf02ba2f..6bb44bbcf 100644 --- a/nx-X11/lib/X11/Xcmsint.h +++ b/nx-X11/lib/X11/Xcmsint.h @@ -34,7 +34,7 @@ #ifndef _XCMSINT_H_ #define _XCMSINT_H_ -#include <X11/Xcms.h> +#include <nx-X11/Xcms.h> /* * DEFINES diff --git a/nx-X11/lib/X11/XimThai.h b/nx-X11/lib/X11/XimThai.h index 5b2666ebf..8d08eca6b 100644 --- a/nx-X11/lib/X11/XimThai.h +++ b/nx-X11/lib/X11/XimThai.h @@ -64,7 +64,7 @@ SOFTWARE. #ifndef _XIMTHAI_H_ #define _XIMTHAI_H_ -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> /* Classification of characters in TIS620 according to WTT */ diff --git a/nx-X11/lib/X11/Ximint.h b/nx-X11/lib/X11/Ximint.h index e9bdda247..afd821c68 100644 --- a/nx-X11/lib/X11/Ximint.h +++ b/nx-X11/lib/X11/Ximint.h @@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. #define _XIMINT_H #include <stdio.h> -#include <X11/Xutil.h> +#include <nx-X11/Xutil.h> #define Public /**/ #define Private static diff --git a/nx-X11/lib/X11/Xintatom.h b/nx-X11/lib/X11/Xintatom.h index f1e13568b..756d3445b 100644 --- a/nx-X11/lib/X11/Xintatom.h +++ b/nx-X11/lib/X11/Xintatom.h @@ -3,7 +3,7 @@ #ifndef _XINTATOM_H_ #define _XINTATOM_H_ 1 -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> /* IntAtom.c */ diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/X11/Xintconn.h index edea98302..ea272833a 100644 --- a/nx-X11/lib/X11/Xintconn.h +++ b/nx-X11/lib/X11/Xintconn.h @@ -3,7 +3,7 @@ #ifndef _XINTCONN_H_ #define _XINTCONN_H_ 1 -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> _XFUNCPROTOBEGIN diff --git a/nx-X11/lib/X11/Xlcint.h b/nx-X11/lib/X11/Xlcint.h index fcc3a65f2..5a52cd36c 100644 --- a/nx-X11/lib/X11/Xlcint.h +++ b/nx-X11/lib/X11/Xlcint.h @@ -74,8 +74,8 @@ from The Open Group. #ifndef _XP_PRINT_SERVER_ -#include <X11/Xresource.h> -#include <X11/Xutil.h> +#include <nx-X11/Xresource.h> +#include <nx-X11/Xutil.h> #include <stdarg.h> typedef Bool (*XFilterEventProc)( diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index 8ce7fb577..d4cecc7b5 100644 --- a/nx-X11/lib/X11/Xlib.h +++ b/nx-X11/lib/X11/Xlib.h @@ -57,11 +57,11 @@ in this Software without prior written authorization from The Open Group. #include <stdint.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> /* applications should not depend on these two headers being included! */ -#include <X11/Xfuncproto.h> -#include <X11/Xosdefs.h> +#include <nx-X11/Xfuncproto.h> +#include <nx-X11/Xosdefs.h> #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV diff --git a/nx-X11/lib/X11/XlibAsync.c b/nx-X11/lib/X11/XlibAsync.c index 81403ebc9..832371782 100644 --- a/nx-X11/lib/X11/XlibAsync.c +++ b/nx-X11/lib/X11/XlibAsync.c @@ -48,8 +48,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xos.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xos.h> /*ARGSUSED*/ Bool diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 0514470dd..0aa890bbb 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -60,9 +60,9 @@ from The Open Group. #include <config.h> #endif #include "Xlibint.h" -#include <X11/Xpoll.h> -#include <X11/Xtrans/Xtrans.h> -#include <X11/extensions/xcmiscstr.h> +#include <nx-X11/Xpoll.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/extensions/xcmiscstr.h> #include <stdio.h> #ifdef WIN32 #include <direct.h> diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index bcd42b52b..854b64b22 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -58,9 +58,9 @@ from The Open Group. * Warning, there be dragons here.... */ -#include <X11/Xlib.h> -#include <X11/Xproto.h> /* to declare xEvent */ -#include <X11/XlibConf.h> /* for configured options like XTHREADS */ +#include <nx-X11/Xlib.h> +#include <nx-X11/Xproto.h> /* to declare xEvent */ +#include <nx-X11/XlibConf.h> /* for configured options like XTHREADS */ #ifdef NX_TRANS_SOCKET @@ -233,14 +233,14 @@ typedef struct _XSQEvent #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #ifdef __sgi #define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ #endif #include <errno.h> #define _XBCOPYFUNC _Xbcopy -#include <X11/Xfuncs.h> -#include <X11/Xosdefs.h> +#include <nx-X11/Xfuncs.h> +#include <nx-X11/Xosdefs.h> /* Utek leaves kernel macros around in include files (bleah) */ #ifdef dirty @@ -250,7 +250,7 @@ typedef struct _XSQEvent #include <stdlib.h> #include <string.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> _XFUNCPROTOBEGIN diff --git a/nx-X11/lib/X11/Xlocale.h b/nx-X11/lib/X11/Xlocale.h index 61d2f7a84..4370d969e 100644 --- a/nx-X11/lib/X11/Xlocale.h +++ b/nx-X11/lib/X11/Xlocale.h @@ -31,8 +31,8 @@ from The Open Group. #ifndef _XLOCALE_H_ #define _XLOCALE_H_ -#include <X11/Xfuncproto.h> -#include <X11/Xosdefs.h> +#include <nx-X11/Xfuncproto.h> +#include <nx-X11/Xosdefs.h> #ifndef X_LOCALE #include <locale.h> diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h index ce1213748..e46a5f467 100644 --- a/nx-X11/lib/X11/Xresource.h +++ b/nx-X11/lib/X11/Xresource.h @@ -52,7 +52,7 @@ SOFTWARE. #define _XRESOURCE_H_ #ifndef _XP_PRINT_SERVER_ -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #endif /**************************************************************** diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index a932a5ce2..f27f9d2e8 100644 --- a/nx-X11/lib/X11/Xrm.c +++ b/nx-X11/lib/X11/Xrm.c @@ -57,13 +57,13 @@ from The Open Group. #include <stdio.h> #include <ctype.h> #include "Xlibint.h" -#include <X11/Xresource.h> +#include <nx-X11/Xresource.h> #include "Xlcint.h" #ifdef XTHREADS #include "locking.h" #endif #include "XrmI.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xresinternal.h" #include "Xresource.h" diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h index 82dab7d56..8c877e697 100644 --- a/nx-X11/lib/X11/Xutil.h +++ b/nx-X11/lib/X11/Xutil.h @@ -52,7 +52,7 @@ SOFTWARE. #define _XUTIL_H_ /* You must include <X11/Xlib.h> before including this file */ -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> /* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/X11/cmsColNm.c index d8c24cdff..63f166efe 100644 --- a/nx-X11/lib/X11/cmsColNm.c +++ b/nx-X11/lib/X11/cmsColNm.c @@ -39,12 +39,12 @@ #endif #include "Xlibint.h" #include "Xcmsint.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <sys/stat.h> #include <stdio.h> #include <ctype.h> #define XK_LATIN1 -#include <X11/keysymdef.h> +#include <nx-X11/keysymdef.h> #include "Cv.h" /* forwards/locals */ diff --git a/nx-X11/lib/X11/cmsProp.c b/nx-X11/lib/X11/cmsProp.c index 81ea58ce9..e9158479e 100644 --- a/nx-X11/lib/X11/cmsProp.c +++ b/nx-X11/lib/X11/cmsProp.c @@ -36,7 +36,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/evtomask.c b/nx-X11/lib/X11/evtomask.c index fbbb998d3..c852c4608 100644 --- a/nx-X11/lib/X11/evtomask.c +++ b/nx-X11/lib/X11/evtomask.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> /* * This array can be used given an event type to determine the mask bits diff --git a/nx-X11/lib/X11/globals.c b/nx-X11/lib/X11/globals.c index 11965cb5f..cf270dc22 100644 --- a/nx-X11/lib/X11/globals.c +++ b/nx-X11/lib/X11/globals.c @@ -38,7 +38,7 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> /* diff --git a/nx-X11/lib/X11/imDefFlt.c b/nx-X11/lib/X11/imDefFlt.c index ccf3ba348..b5b107221 100644 --- a/nx-X11/lib/X11/imDefFlt.c +++ b/nx-X11/lib/X11/imDefFlt.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xutil.h" diff --git a/nx-X11/lib/X11/imDefIm.c b/nx-X11/lib/X11/imDefIm.c index 7581548e7..e963f3560 100644 --- a/nx-X11/lib/X11/imDefIm.c +++ b/nx-X11/lib/X11/imDefIm.c @@ -36,7 +36,7 @@ OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imDefLkup.c b/nx-X11/lib/X11/imDefLkup.c index aa1aaaf06..5bdcb77c3 100644 --- a/nx-X11/lib/X11/imDefLkup.c +++ b/nx-X11/lib/X11/imDefLkup.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imDispch.c b/nx-X11/lib/X11/imDispch.c index c0c4bc726..1e3287529 100644 --- a/nx-X11/lib/X11/imDispch.c +++ b/nx-X11/lib/X11/imDispch.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #include "Xlibint.h" #include "Xutil.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imEvToWire.c b/nx-X11/lib/X11/imEvToWire.c index f407296df..211252a50 100644 --- a/nx-X11/lib/X11/imEvToWire.c +++ b/nx-X11/lib/X11/imEvToWire.c @@ -27,8 +27,8 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xlib.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xlib.h> #undef NEED_EVENTS #include "Ximint.h" diff --git a/nx-X11/lib/X11/imExten.c b/nx-X11/lib/X11/imExten.c index 782d1c356..6cb663f66 100644 --- a/nx-X11/lib/X11/imExten.c +++ b/nx-X11/lib/X11/imExten.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imInt.c b/nx-X11/lib/X11/imInt.c index 5a047e4aa..9658eef58 100644 --- a/nx-X11/lib/X11/imInt.c +++ b/nx-X11/lib/X11/imInt.c @@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcFlt.c b/nx-X11/lib/X11/imLcFlt.c index c3c64bf46..7ff642fae 100644 --- a/nx-X11/lib/X11/imLcFlt.c +++ b/nx-X11/lib/X11/imLcFlt.c @@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include "Xlibint.h" -#include <X11/keysym.h> +#include <nx-X11/keysym.h> #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcIc.c b/nx-X11/lib/X11/imLcIc.c index 760e24c5f..475bbbef8 100644 --- a/nx-X11/lib/X11/imLcIc.c +++ b/nx-X11/lib/X11/imLcIc.c @@ -32,8 +32,8 @@ PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcIm.c b/nx-X11/lib/X11/imLcIm.c index 675b48224..0a9027e6f 100644 --- a/nx-X11/lib/X11/imLcIm.c +++ b/nx-X11/lib/X11/imLcIm.c @@ -39,11 +39,11 @@ THIS SOFTWARE. #endif #include <stdio.h> /* -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> */ -#include <X11/Xmd.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" diff --git a/nx-X11/lib/X11/imLcLkup.c b/nx-X11/lib/X11/imLcLkup.c index 59025a529..b1db9f8f7 100644 --- a/nx-X11/lib/X11/imLcLkup.c +++ b/nx-X11/lib/X11/imLcLkup.c @@ -35,11 +35,11 @@ PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> -#include <X11/Xlib.h> -#include <X11/keysym.h> -#include <X11/Xutil.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/keysym.h> +#include <nx-X11/Xutil.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/X11/imLcPrs.c index 9736e135c..616d45186 100644 --- a/nx-X11/lib/X11/imLcPrs.c +++ b/nx-X11/lib/X11/imLcPrs.c @@ -35,9 +35,9 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> -#include <X11/Xmd.h> -#include <X11/Xos.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcSIc.c b/nx-X11/lib/X11/imLcSIc.c index a32211ce2..e36c52269 100644 --- a/nx-X11/lib/X11/imLcSIc.c +++ b/nx-X11/lib/X11/imLcSIc.c @@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xutil.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imRm.c b/nx-X11/lib/X11/imRm.c index 7dbc385cb..1da1b2967 100644 --- a/nx-X11/lib/X11/imRm.c +++ b/nx-X11/lib/X11/imRm.c @@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiFlt.c b/nx-X11/lib/X11/imThaiFlt.c index 18df0e1ff..41ab992b0 100644 --- a/nx-X11/lib/X11/imThaiFlt.c +++ b/nx-X11/lib/X11/imThaiFlt.c @@ -68,10 +68,10 @@ SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> -#include <X11/keysym.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/keysym.h> +#include <nx-X11/Xutil.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiIc.c b/nx-X11/lib/X11/imThaiIc.c index 67d7cc268..97a72ac81 100644 --- a/nx-X11/lib/X11/imThaiIc.c +++ b/nx-X11/lib/X11/imThaiIc.c @@ -38,8 +38,8 @@ THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiIm.c b/nx-X11/lib/X11/imThaiIm.c index e24715022..85e9df6d3 100644 --- a/nx-X11/lib/X11/imThaiIm.c +++ b/nx-X11/lib/X11/imThaiIm.c @@ -38,10 +38,10 @@ THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xmd.h> -#include <X11/Xatom.h> -#include <X11/Xos.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" diff --git a/nx-X11/lib/X11/imTrX.c b/nx-X11/lib/X11/imTrX.c index e2de05f28..7d00bb3f7 100644 --- a/nx-X11/lib/X11/imTrX.c +++ b/nx-X11/lib/X11/imTrX.c @@ -34,7 +34,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <string.h> -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imTrans.c b/nx-X11/lib/X11/imTrans.c index a239219b7..e9715927b 100644 --- a/nx-X11/lib/X11/imTrans.c +++ b/nx-X11/lib/X11/imTrans.c @@ -34,18 +34,18 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif #include <stdio.h> -#include <X11/Xatom.h> -#include <X11/Xmd.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xmd.h> #define NEED_EVENTS #include "Xlibint.h" -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "Xlcint.h" #include "Ximint.h" #include "XimTrans.h" #include "XimTrInt.h" #ifdef WIN32 -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif diff --git a/nx-X11/lib/X11/lcCT.c b/nx-X11/lib/X11/lcCT.c index 63608a3cd..41c7cf418 100644 --- a/nx-X11/lib/X11/lcCT.c +++ b/nx-X11/lib/X11/lcCT.c @@ -43,7 +43,7 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <stdio.h> diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c index ffa8f49ae..7a14d3d4f 100644 --- a/nx-X11/lib/X11/lcDB.c +++ b/nx-X11/lib/X11/lcDB.c @@ -37,8 +37,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> -#include <X11/Xresource.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xresource.h> #include "Xlibint.h" #include "XlcPubI.h" diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/X11/lcFile.c index 691daeb9e..2e0a49db4 100644 --- a/nx-X11/lib/X11/lcFile.c +++ b/nx-X11/lib/X11/lcFile.c @@ -33,7 +33,7 @@ #include <ctype.h> #include "Xlibint.h" #include "XlcPubI.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #if 0 #include <unistd.h> /* in theory delivers getresuid/gid prototypes, * in practice only the Linux syscall wrapper is there. */ diff --git a/nx-X11/lib/X11/lcPrTxt.c b/nx-X11/lib/X11/lcPrTxt.c index 5a781280e..1a55d1cab 100644 --- a/nx-X11/lib/X11/lcPrTxt.c +++ b/nx-X11/lib/X11/lcPrTxt.c @@ -30,8 +30,8 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include <X11/Xutil.h> -#include <X11/Xatom.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xatom.h> static XPointer * alloc_list( diff --git a/nx-X11/lib/X11/lcTxtPr.c b/nx-X11/lib/X11/lcTxtPr.c index 1f9765f6e..e214ac4e9 100644 --- a/nx-X11/lib/X11/lcTxtPr.c +++ b/nx-X11/lib/X11/lcTxtPr.c @@ -30,8 +30,8 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include <X11/Xutil.h> -#include <X11/Xatom.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xatom.h> #include <stdio.h> static int diff --git a/nx-X11/lib/X11/lcUtil.c b/nx-X11/lib/X11/lcUtil.c index ab1db0083..3e49fd08f 100644 --- a/nx-X11/lib/X11/lcUtil.c +++ b/nx-X11/lib/X11/lcUtil.c @@ -29,7 +29,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #include "XlcPublic.h" /* Don't use <ctype.h> here because it is locale dependent. */ diff --git a/nx-X11/lib/X11/lcWrap.c b/nx-X11/lib/X11/lcWrap.c index ea2623191..b694425fe 100644 --- a/nx-X11/lib/X11/lcWrap.c +++ b/nx-X11/lib/X11/lcWrap.c @@ -61,12 +61,12 @@ from The Open Group. #include <stdlib.h> #include "Xlibint.h" #include "Xlcint.h" -#include <X11/Xlocale.h> -#include <X11/Xos.h> +#include <nx-X11/Xlocale.h> +#include <nx-X11/Xos.h> #ifdef WIN32 #undef close #endif -#include <X11/Xutil.h> +#include <nx-X11/Xutil.h> #include "XlcPubI.h" #ifdef XTHREADS diff --git a/nx-X11/lib/X11/locking.h b/nx-X11/lib/X11/locking.h index 96c99b972..4b847ded6 100644 --- a/nx-X11/lib/X11/locking.h +++ b/nx-X11/lib/X11/locking.h @@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group. #define xmalloc(s) Xmalloc(s) #define xfree(s) Xfree(s) -#include <X11/Xthreads.h> +#include <nx-X11/Xthreads.h> struct _XCVList { xcondition_t cv; diff --git a/nx-X11/lib/X11/mbWMProps.c b/nx-X11/lib/X11/mbWMProps.c index a5f7732e4..8b16bc990 100644 --- a/nx-X11/lib/X11/mbWMProps.c +++ b/nx-X11/lib/X11/mbWMProps.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/Xatom.h> -#include <X11/Xlocale.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xlocale.h> void XmbSetWMProperties ( diff --git a/nx-X11/lib/X11/omDefault.c b/nx-X11/lib/X11/omDefault.c index 57dd975ad..eaa75ff84 100644 --- a/nx-X11/lib/X11/omDefault.c +++ b/nx-X11/lib/X11/omDefault.c @@ -35,8 +35,8 @@ #endif #include "Xlibint.h" #include "XomGeneric.h" -#include <X11/Xos.h> -#include <X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xatom.h> #include <stdio.h> #define DefineLocalBuf char local_buf[BUFSIZ] diff --git a/nx-X11/lib/X11/omGeneric.c b/nx-X11/lib/X11/omGeneric.c index e6c23f4e2..8f4942873 100644 --- a/nx-X11/lib/X11/omGeneric.c +++ b/nx-X11/lib/X11/omGeneric.c @@ -55,8 +55,8 @@ #include "Xlibint.h" #include "XomGeneric.h" #include "XlcGeneric.h" -#include <X11/Xos.h> -#include <X11/Xatom.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xatom.h> #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/nx-X11/lib/X11/os2Stubs.c b/nx-X11/lib/X11/os2Stubs.c index 9d109025c..804d2e14e 100644 --- a/nx-X11/lib/X11/os2Stubs.c +++ b/nx-X11/lib/X11/os2Stubs.c @@ -37,7 +37,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include <stdio.h> #include <sys/errno.h> #define INCL_DOSSEMAPHORES diff --git a/nx-X11/lib/X11/utf8WMProps.c b/nx-X11/lib/X11/utf8WMProps.c index e3a329ac8..69366b6cb 100644 --- a/nx-X11/lib/X11/utf8WMProps.c +++ b/nx-X11/lib/X11/utf8WMProps.c @@ -53,10 +53,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/Xatom.h> -#include <X11/Xlocale.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xatom.h> +#include <nx-X11/Xlocale.h> void Xutf8SetWMProperties ( diff --git a/nx-X11/lib/X11/util/makekeys.c b/nx-X11/lib/X11/util/makekeys.c index 0b0ad9e2c..d2a7b4aef 100644 --- a/nx-X11/lib/X11/util/makekeys.c +++ b/nx-X11/lib/X11/util/makekeys.c @@ -31,9 +31,9 @@ from The Open Group. /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ -#include <X11/X.h> -#include <X11/Xos.h> -#include <X11/keysymdef.h> +#include <nx-X11/X.h> +#include <nx-X11/Xos.h> +#include <nx-X11/keysymdef.h> #include <stdio.h> #include <stdlib.h> #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ diff --git a/nx-X11/lib/X11/uvY.c b/nx-X11/lib/X11/uvY.c index d7c3e6ab2..c07fcfc39 100644 --- a/nx-X11/lib/X11/uvY.c +++ b/nx-X11/lib/X11/uvY.c @@ -40,7 +40,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/xyY.c b/nx-X11/lib/X11/xyY.c index 63e80bc59..ba0b06137 100644 --- a/nx-X11/lib/X11/xyY.c +++ b/nx-X11/lib/X11/xyY.c @@ -40,7 +40,7 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/Xau/AuDispose.c b/nx-X11/lib/Xau/AuDispose.c index 58ffd61e7..dc2080f40 100644 --- a/nx-X11/lib/Xau/AuDispose.c +++ b/nx-X11/lib/Xau/AuDispose.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> +#include <nx-X11/Xauth.h> #include <stdlib.h> void diff --git a/nx-X11/lib/Xau/AuFileName.c b/nx-X11/lib/Xau/AuFileName.c index a51fc3bff..6ab0138b8 100644 --- a/nx-X11/lib/Xau/AuFileName.c +++ b/nx-X11/lib/Xau/AuFileName.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> -#include <X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xos.h> #include <stdlib.h> char * diff --git a/nx-X11/lib/Xau/AuGetAddr.c b/nx-X11/lib/Xau/AuGetAddr.c index ab13cb630..d68ceadc2 100644 --- a/nx-X11/lib/Xau/AuGetAddr.c +++ b/nx-X11/lib/Xau/AuGetAddr.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> -#include <X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xos.h> static int binaryEqual (_Xconst char *a, _Xconst char *b, int len) diff --git a/nx-X11/lib/Xau/AuGetBest.c b/nx-X11/lib/Xau/AuGetBest.c index 5ff1c7cd3..eb27f24c1 100644 --- a/nx-X11/lib/Xau/AuGetBest.c +++ b/nx-X11/lib/Xau/AuGetBest.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> -#include <X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xos.h> #ifdef XTHREADS -#include <X11/Xthreads.h> +#include <nx-X11/Xthreads.h> #endif #ifdef hpux #define X_INCLUDE_NETDB_H #define XOS_USE_NO_LOCKING -#include <X11/Xos_r.h> +#include <nx-X11/Xos_r.h> #endif static int diff --git a/nx-X11/lib/Xau/AuLock.c b/nx-X11/lib/Xau/AuLock.c index 001235607..1813dc368 100644 --- a/nx-X11/lib/Xau/AuLock.c +++ b/nx-X11/lib/Xau/AuLock.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> -#include <X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xos.h> #include <sys/stat.h> #include <errno.h> #include <time.h> @@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group. #ifndef WIN32 extern unsigned sleep (); #else -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #define link rename #endif #endif diff --git a/nx-X11/lib/Xau/AuRead.c b/nx-X11/lib/Xau/AuRead.c index 60a0d747f..2e2509633 100644 --- a/nx-X11/lib/Xau/AuRead.c +++ b/nx-X11/lib/Xau/AuRead.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> +#include <nx-X11/Xauth.h> #include <stdlib.h> #include <errno.h> diff --git a/nx-X11/lib/Xau/AuUnlock.c b/nx-X11/lib/Xau/AuUnlock.c index 460effe86..e40042104 100644 --- a/nx-X11/lib/Xau/AuUnlock.c +++ b/nx-X11/lib/Xau/AuUnlock.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> -#include <X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xos.h> int XauUnlockAuth ( diff --git a/nx-X11/lib/Xau/AuWrite.c b/nx-X11/lib/Xau/AuWrite.c index f25abc9e6..5a9b44eb2 100644 --- a/nx-X11/lib/Xau/AuWrite.c +++ b/nx-X11/lib/Xau/AuWrite.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> +#include <nx-X11/Xauth.h> static int write_short (unsigned short s, FILE *file) diff --git a/nx-X11/lib/Xau/Autest.c b/nx-X11/lib/Xau/Autest.c index 298464908..2352cf170 100644 --- a/nx-X11/lib/Xau/Autest.c +++ b/nx-X11/lib/Xau/Autest.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xauth.h> +#include <nx-X11/Xauth.h> main (argc, argv) char **argv; diff --git a/nx-X11/lib/Xau/Imakefile b/nx-X11/lib/Xau/Imakefile index 331d29c09..df80d28d4 100644 --- a/nx-X11/lib/Xau/Imakefile +++ b/nx-X11/lib/Xau/Imakefile @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $ #define DoProfileLib ProfileLibXau #define LibName NX_Xau #define SoRev SOXAUTHREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #include <Threads.tmpl> diff --git a/nx-X11/lib/Xau/k5encode.c b/nx-X11/lib/Xau/k5encode.c index a3c6c09b1..c71222e1c 100644 --- a/nx-X11/lib/Xau/k5encode.c +++ b/nx-X11/lib/Xau/k5encode.c @@ -45,10 +45,10 @@ in this Software without prior written authorization from The Open Group. #undef BITS32 #undef xfree -#include <X11/X.h> -#include <X11/Xos.h> -#include <X11/Xmd.h> -#include <X11/Xfuncs.h> +#include <nx-X11/X.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xfuncs.h> /* * XauKrb5Encode diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index a8e4077fa..24820c146 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -16,7 +16,7 @@ SOXCOMPOSITEREV=1.0.0 #define LibName NX_Xcomposite #define SoRev SOXCOMPOSITEREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #include <Threads.tmpl> diff --git a/nx-X11/lib/Xcomposite/Xcomposite.h b/nx-X11/lib/Xcomposite/Xcomposite.h index 3604141bb..c28cc6857 100644 --- a/nx-X11/lib/Xcomposite/Xcomposite.h +++ b/nx-X11/lib/Xcomposite/Xcomposite.h @@ -25,9 +25,9 @@ #ifndef _XCOMPOSITE_H_ #define _XCOMPOSITE_H_ -#include <X11/extensions/composite.h> -#include <X11/extensions/Xfixes.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/composite.h> +#include <nx-X11/extensions/Xfixes.h> +#include <nx-X11/Xfuncproto.h> /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/lib/Xcomposite/xcompositeint.h b/nx-X11/lib/Xcomposite/xcompositeint.h index af5f57500..7b12e8d55 100644 --- a/nx-X11/lib/Xcomposite/xcompositeint.h +++ b/nx-X11/lib/Xcomposite/xcompositeint.h @@ -28,11 +28,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/extensions/compositeproto.h> -#include <X11/extensions/Xcomposite.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/extensions/compositeproto.h> +#include <nx-X11/extensions/Xcomposite.h> typedef struct _XCompositeExtDisplayInfo { struct _XCompositeExtDisplayInfo *next; /* keep a linked list */ diff --git a/nx-X11/lib/Xext/DPMS.c b/nx-X11/lib/Xext/DPMS.c index 35b21b4ad..a2c0dc3c5 100644 --- a/nx-X11/lib/Xext/DPMS.c +++ b/nx-X11/lib/Xext/DPMS.c @@ -36,11 +36,11 @@ Equipment Corporation. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/dpms.h> -#include <X11/extensions/dpmsstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/dpms.h> +#include <nx-X11/extensions/dpmsstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #include <stdio.h> static XExtensionInfo _dpms_info_data; diff --git a/nx-X11/lib/Xext/MITMisc.c b/nx-X11/lib/Xext/MITMisc.c index c0fa87209..8ba35dce1 100644 --- a/nx-X11/lib/Xext/MITMisc.c +++ b/nx-X11/lib/Xext/MITMisc.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/MITMisc.h> -#include <X11/extensions/mitmiscstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/MITMisc.h> +#include <nx-X11/extensions/mitmiscstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _mit_info_data; static XExtensionInfo *mit_info = &_mit_info_data; diff --git a/nx-X11/lib/Xext/XAppgroup.c b/nx-X11/lib/Xext/XAppgroup.c index 2ca3e4d21..abbf1c1b9 100644 --- a/nx-X11/lib/Xext/XAppgroup.c +++ b/nx-X11/lib/Xext/XAppgroup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xagstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xagstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #include <stdarg.h> diff --git a/nx-X11/lib/Xext/XEVI.c b/nx-X11/lib/Xext/XEVI.c index a64b9c1ba..e5a811bdf 100644 --- a/nx-X11/lib/Xext/XEVI.c +++ b/nx-X11/lib/Xext/XEVI.c @@ -27,12 +27,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/XEVI.h> -#include <X11/extensions/XEVIstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/XEVI.h> +#include <nx-X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/Xutil.h> static XExtensionInfo *xevi_info;/* needs to move to globals.c */ static /* const */ char *xevi_extension_name = EVINAME; #define XeviCheckExtension(dpy,i,val) \ diff --git a/nx-X11/lib/Xext/XLbx.c b/nx-X11/lib/Xext/XLbx.c index 8c0cfad0b..450bd5bc5 100644 --- a/nx-X11/lib/Xext/XLbx.c +++ b/nx-X11/lib/Xext/XLbx.c @@ -30,11 +30,11 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/XLbx.h> -#include <X11/extensions/lbxstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/XLbx.h> +#include <nx-X11/extensions/lbxstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _lbx_info_data; static XExtensionInfo *lbx_info = &_lbx_info_data; diff --git a/nx-X11/lib/Xext/XMultibuf.c b/nx-X11/lib/Xext/XMultibuf.c index 3e0049e92..570676def 100644 --- a/nx-X11/lib/Xext/XMultibuf.c +++ b/nx-X11/lib/Xext/XMultibuf.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> #include <stdio.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/multibufst.h> static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; diff --git a/nx-X11/lib/Xext/XSecurity.c b/nx-X11/lib/Xext/XSecurity.c index 161ade3b7..a9899916f 100644 --- a/nx-X11/lib/Xext/XSecurity.c +++ b/nx-X11/lib/Xext/XSecurity.c @@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> #include <stdio.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/securstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/securstr.h> static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; diff --git a/nx-X11/lib/Xext/XShape.c b/nx-X11/lib/Xext/XShape.c index 29a7f83f9..79b4b78f6 100644 --- a/nx-X11/lib/Xext/XShape.c +++ b/nx-X11/lib/Xext/XShape.c @@ -31,12 +31,12 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/Xregion.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/shapestr.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xregion.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/shapestr.h> static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; diff --git a/nx-X11/lib/Xext/XShm.c b/nx-X11/lib/Xext/XShm.c index f4e29a42b..ec3720732 100644 --- a/nx-X11/lib/Xext/XShm.c +++ b/nx-X11/lib/Xext/XShm.c @@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/ImUtil.h> -#include <X11/extensions/XShm.h> -#include <X11/extensions/shmstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/ImUtil.h> +#include <nx-X11/extensions/XShm.h> +#include <nx-X11/extensions/shmstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _shm_info_data; static XExtensionInfo *shm_info = &_shm_info_data; diff --git a/nx-X11/lib/Xext/XSync.c b/nx-X11/lib/Xext/XSync.c index 61f8600ce..39eb97cdd 100644 --- a/nx-X11/lib/Xext/XSync.c +++ b/nx-X11/lib/Xext/XSync.c @@ -58,10 +58,10 @@ PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/syncstr.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/syncstr.h> static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; diff --git a/nx-X11/lib/Xext/XTestExt1.c b/nx-X11/lib/Xext/XTestExt1.c index ee4a0bde0..00da036bd 100644 --- a/nx-X11/lib/Xext/XTestExt1.c +++ b/nx-X11/lib/Xext/XTestExt1.c @@ -64,9 +64,9 @@ University of California. #include <config.h> #endif #include <stdio.h> -#include <X11/Xproto.h> -#include <X11/Xlibint.h> -#include <X11/extensions/xtestext1.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/xtestext1.h> /****************************************************************************** * variables diff --git a/nx-X11/lib/Xext/Xcup.c b/nx-X11/lib/Xext/Xcup.c index 6315d32a4..8bf2bb29e 100644 --- a/nx-X11/lib/Xext/Xcup.c +++ b/nx-X11/lib/Xext/Xcup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xcupstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xcupstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; diff --git a/nx-X11/lib/Xext/Xdbe.c b/nx-X11/lib/Xext/Xdbe.c index 954c8f01d..05df171f6 100644 --- a/nx-X11/lib/Xext/Xdbe.c +++ b/nx-X11/lib/Xext/Xdbe.c @@ -38,11 +38,11 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #define NEED_DBE_PROTOCOL -#include <X11/extensions/Xdbe.h> +#include <nx-X11/extensions/Xdbe.h> static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; diff --git a/nx-X11/lib/Xext/extutil.c b/nx-X11/lib/Xext/extutil.c index d96b17f3f..bd79dbdb2 100644 --- a/nx-X11/lib/Xext/extutil.c +++ b/nx-X11/lib/Xext/extutil.c @@ -51,9 +51,9 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> /* diff --git a/nx-X11/lib/Xext/globals.c b/nx-X11/lib/Xext/globals.c index 0cd5d2690..53a18690d 100644 --- a/nx-X11/lib/Xext/globals.c +++ b/nx-X11/lib/Xext/globals.c @@ -34,8 +34,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> -#include <X11/extensions/Xext.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/extensions/Xext.h> #include <stddef.h> /* for definition of NULL */ /* diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile index ca1fe046b..cc3e1631d 100644 --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile @@ -16,7 +16,7 @@ SOXFIXESREV=3.0.0 #define LibName NX_Xfixes #define SoRev SOXFIXESREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #include <Threads.tmpl> diff --git a/nx-X11/lib/Xfixes/Xfixes.h b/nx-X11/lib/Xfixes/Xfixes.h index 28ca28f1a..4cba47ca4 100644 --- a/nx-X11/lib/Xfixes/Xfixes.h +++ b/nx-X11/lib/Xfixes/Xfixes.h @@ -25,9 +25,9 @@ #ifndef _XFIXES_H_ #define _XFIXES_H_ -#include <X11/extensions/xfixeswire.h> +#include <nx-X11/extensions/xfixeswire.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/lib/Xfixes/Xfixes.man b/nx-X11/lib/Xfixes/Xfixes.man index f081cc54e..563db15b5 100644 --- a/nx-X11/lib/Xfixes/Xfixes.man +++ b/nx-X11/lib/Xfixes/Xfixes.man @@ -31,7 +31,7 @@ .SH NAME XFixes \- Augmented versions of core protocol requests .SH SYNTAX -\&#include <X11/extensions/Xfixes.h> +\&#include <nx-X11/extensions/Xfixes.h> .nf .sp Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, diff --git a/nx-X11/lib/Xfixes/Xfixesint.h b/nx-X11/lib/Xfixes/Xfixesint.h index e227571be..353dcae77 100644 --- a/nx-X11/lib/Xfixes/Xfixesint.h +++ b/nx-X11/lib/Xfixes/Xfixesint.h @@ -28,11 +28,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xlibint.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> #include "Xfixes.h" -#include <X11/extensions/xfixesproto.h> +#include <nx-X11/extensions/xfixesproto.h> extern char XFixesExtensionName[]; diff --git a/nx-X11/lib/Xinerama/Xinerama.c b/nx-X11/lib/Xinerama/Xinerama.c index fd717dd22..0256336be 100644 --- a/nx-X11/lib/Xinerama/Xinerama.c +++ b/nx-X11/lib/Xinerama/Xinerama.c @@ -27,13 +27,13 @@ Equipment Corporation. #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/panoramiXext.h> -#include <X11/extensions/panoramiXproto.h> -#include <X11/extensions/Xinerama.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/panoramiXext.h> +#include <nx-X11/extensions/panoramiXproto.h> +#include <nx-X11/extensions/Xinerama.h> #include <stdio.h> static XExtensionInfo _panoramiX_ext_info_data; diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index 35d826b22..c5a0f89fc 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -71,7 +71,7 @@ clean:: #define SoRev SOXRENDERREV #ifdef XBuildIncDir -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions RENDERINCDIR = $(BUILDINCDIR) #else diff --git a/nx-X11/lib/Xrender/Picture.c b/nx-X11/lib/Xrender/Picture.c index 0b18f5c57..260eda05e 100644 --- a/nx-X11/lib/Xrender/Picture.c +++ b/nx-X11/lib/Xrender/Picture.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "Xrenderint.h" -#include <X11/Xregion.h> +#include <nx-X11/Xregion.h> static void _XRenderProcessPictureAttributes (Display *dpy, diff --git a/nx-X11/lib/Xrender/Xrender.h b/nx-X11/lib/Xrender/Xrender.h index 4d125cd81..a38f4cc3d 100644 --- a/nx-X11/lib/Xrender/Xrender.h +++ b/nx-X11/lib/Xrender/Xrender.h @@ -27,12 +27,12 @@ #define NX_CLEANUP -#include <X11/extensions/render.h> +#include <nx-X11/extensions/render.h> -#include <X11/Xlib.h> -#include <X11/Xfuncproto.h> -#include <X11/Xosdefs.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xfuncproto.h> +#include <nx-X11/Xosdefs.h> +#include <nx-X11/Xutil.h> #ifdef NX_CLEANUP #include "renderproto.h" diff --git a/nx-X11/lib/Xrender/Xrenderint.h b/nx-X11/lib/Xrender/Xrenderint.h index a90fe65d8..9744b0da4 100644 --- a/nx-X11/lib/Xrender/Xrenderint.h +++ b/nx-X11/lib/Xrender/Xrenderint.h @@ -28,9 +28,9 @@ #include "config.h" #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/extensions/renderproto.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/extensions/renderproto.h> #include "Xrender.h" typedef struct { diff --git a/nx-X11/lib/Xtst/XRecord.c b/nx-X11/lib/Xtst/XRecord.c index 05cbda889..8e1823ef9 100644 --- a/nx-X11/lib/Xtst/XRecord.c +++ b/nx-X11/lib/Xtst/XRecord.c @@ -56,10 +56,10 @@ from The Open Group. #include <assert.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/recordstr.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/recordstr.h> static XExtensionInfo _xrecord_info_data; static XExtensionInfo *xrecord_info = &_xrecord_info_data; diff --git a/nx-X11/lib/Xtst/XTest.c b/nx-X11/lib/Xtst/XTest.c index 2c3ae2b41..6b814aab4 100644 --- a/nx-X11/lib/Xtst/XTest.c +++ b/nx-X11/lib/Xtst/XTest.c @@ -33,13 +33,13 @@ from The Open Group. /* $XFree86: xc/lib/Xtst/XTest.c,v 1.5 2001/12/14 19:56:40 dawes Exp $ */ #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/XTest.h> -#include <X11/extensions/xteststr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/XInput.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xteststr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/XInput.h> +#include <nx-X11/extensions/XIproto.h> static XExtensionInfo _xtest_info_data; static XExtensionInfo *xtest_info = &_xtest_info_data; diff --git a/nx-X11/lib/oldX/Imakefile b/nx-X11/lib/oldX/Imakefile index 663d11019..e2ee75eb0 100644 --- a/nx-X11/lib/oldX/Imakefile +++ b/nx-X11/lib/oldX/Imakefile @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $ #define DoProfileLib ProfileOldX #define LibName NX_oldX #define SoRev SOOLDXREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #ifdef SharedOldXReqs REQUIREDLIBS = SharedOldXReqs 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) diff --git a/nx-X11/lib/xtrans/Imakefile b/nx-X11/lib/xtrans/Imakefile index e29a38591..2cc880c39 100644 --- a/nx-X11/lib/xtrans/Imakefile +++ b/nx-X11/lib/xtrans/Imakefile @@ -1,6 +1,6 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ -#define IncSubdir X11 +#define IncSubdir nx-X11 all:: |