diff options
Diffstat (limited to 'nx-X11/programs/Xserver')
235 files changed, 1121 insertions, 756 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h index 193ebcb6f..4238de537 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxserver.h +++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h @@ -41,9 +41,9 @@ ** */ -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xmd.h> #include <misc.h> #include <dixstruct.h> #include <pixmapstr.h> diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c index 6441a4b4f..1889bdabd 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c @@ -39,7 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <gcstruct.h> #include "pixmapstr.h" #include "xf86glx_util.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "GL/xf86glx.h" #ifdef ROUNDUP diff --git a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c index 3b9955eba..a3e1d08c6 100644 --- a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c +++ b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c @@ -8,7 +8,7 @@ #include "xf86Module.h" -#include <X11/extensions/xtrapdi.h> +#include <nx-X11/extensions/xtrapdi.h> extern void DEC_XTRAPInit(INITARGS); diff --git a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c index 2dba356b7..1b4be39cd 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c @@ -44,7 +44,7 @@ SOFTWARE. #ifndef EXTMODULE #include <errno.h> -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #ifdef PC # include "fcntl.h" # include "io.h" @@ -56,7 +56,7 @@ SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> /* From library include environment */ +#include <nx-X11/X.h> /* From library include environment */ #include "input.h" /* From server include env. (must be before Xlib.h!) */ #ifdef PC # include "scrintst.h" /* Screen struct */ @@ -66,9 +66,9 @@ SOFTWARE. # include "scrnintstr.h" /* Screen struct */ #endif -#include <X11/extensions/xtrapdi.h> -#include <X11/extensions/xtrapddmi.h> -#include <X11/extensions/xtrapproto.h> +#include <nx-X11/extensions/xtrapdi.h> +#include <nx-X11/extensions/xtrapddmi.h> +#include <nx-X11/extensions/xtrapproto.h> extern int XETrapErrorBase; extern xXTrapGetAvailReply XETrap_avail; diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdi.c b/nx-X11/programs/Xserver/XTrap/xtrapdi.c index bdddb6310..987d54e4f 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapdi.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapdi.c @@ -58,12 +58,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef EXTMODULE #include <stdio.h> #include <errno.h> -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #else #include "xf86_ansic.h" #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" /* Server swapping macros */ #include "dixstruct.h" /* Server ClientRec definitions */ @@ -77,9 +77,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #include "pixmapstr.h" /* DrawableRec */ #include "windowstr.h" /* Drawable Lookup structures */ -#include <X11/extensions/xtrapdi.h> -#include <X11/extensions/xtrapddmi.h> -#include <X11/extensions/xtrapproto.h> +#include <nx-X11/extensions/xtrapdi.h> +#include <nx-X11/extensions/xtrapddmi.h> +#include <nx-X11/extensions/xtrapproto.h> #include "colormapst.h" #ifdef PANORAMIX #include "panoramiX.h" diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c index c43f6e332..ba8249c35 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c @@ -49,12 +49,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> -#include <X11/Xprotostr.h> -#include <X11/extensions/xtrapdi.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xprotostr.h> +#include <nx-X11/extensions/xtrapdi.h> #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" #include "dixstruct.h" @@ -64,8 +64,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif # include "swapreq.h" /* Server SwapColorItem definition */ -#include <X11/extensions/xtrapddmi.h> -#include <X11/extensions/xtrapproto.h> +#include <nx-X11/extensions/xtrapddmi.h> +#include <nx-X11/extensions/xtrapproto.h> /* In-coming XTrap requests needing to be swapped to native format */ diff --git a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c index a9ceddb3d..10a070e9e 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c @@ -39,12 +39,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> -#include <X11/Xprotostr.h> -#include <X11/extensions/xtrapdi.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xprotostr.h> +#include <nx-X11/extensions/xtrapdi.h> #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" #include "dixstruct.h" @@ -53,8 +53,8 @@ SOFTWARE. #else # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif -#include <X11/extensions/xtrapddmi.h> -#include <X11/extensions/xtrapproto.h> +#include <nx-X11/extensions/xtrapddmi.h> +#include <nx-X11/extensions/xtrapproto.h> globaldef void_function XETSwProcVector[256L] = { diff --git a/nx-X11/programs/Xserver/Xext/EVI.c b/nx-X11/programs/Xserver/Xext/EVI.c index 93ed19fa6..1eca62693 100644 --- a/nx-X11/programs/Xserver/Xext/EVI.c +++ b/nx-X11/programs/Xserver/Xext/EVI.c @@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include <X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/XEVIstr.h> #include "EVIstruct.h" #include "modinit.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/Xext/appgroup.c b/nx-X11/programs/Xserver/Xext/appgroup.c index e23ceca59..1dd4f1ae5 100644 --- a/nx-X11/programs/Xserver/Xext/appgroup.c +++ b/nx-X11/programs/Xserver/Xext/appgroup.c @@ -32,8 +32,8 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -42,14 +42,14 @@ from The Open Group. #include "colormapst.h" #include "servermd.h" #define _XAG_SERVER_ -#include <X11/extensions/Xagstr.h> -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagstr.h> +#include <nx-X11/extensions/Xagsrv.h> #define _SECURITY_SERVER -#include <X11/extensions/security.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/security.h> +#include <nx-X11/Xfuncproto.h> #define XSERV_t -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "../os/osdep.h" #include <stdio.h> diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c index 3d6d49ca7..eba552cfe 100644 --- a/nx-X11/programs/Xserver/Xext/bigreq.c +++ b/nx-X11/programs/Xserver/Xext/bigreq.c @@ -33,13 +33,13 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/extensions/bigreqstr.h> #include "opaque.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/cup.c b/nx-X11/programs/Xserver/Xext/cup.c index 198aa801f..9b6d25c21 100644 --- a/nx-X11/programs/Xserver/Xext/cup.c +++ b/nx-X11/programs/Xserver/Xext/cup.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -42,8 +42,8 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "swapreq.h" #define _XCUP_SERVER_ -#include <X11/extensions/Xcupstr.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/Xcupstr.h> +#include <nx-X11/Xfuncproto.h> #ifndef EXTMODULE #include "../os/osdep.h" diff --git a/nx-X11/programs/Xserver/Xext/dgaproc.h b/nx-X11/programs/Xserver/Xext/dgaproc.h index eb9791098..4d3f224e6 100644 --- a/nx-X11/programs/Xserver/Xext/dgaproc.h +++ b/nx-X11/programs/Xserver/Xext/dgaproc.h @@ -3,7 +3,7 @@ #ifndef __DGAPROC_H #define __DGAPROC_H -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "pixmap.h" #define DGA_CONCURRENT_ACCESS 0x00000001 diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 3e79602d1..fc40193e4 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -39,16 +39,16 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" #define DPMS_SERVER -#include <X11/extensions/dpms.h> -#include <X11/extensions/dpmsstr.h> +#include <nx-X11/extensions/dpms.h> +#include <nx-X11/extensions/dpmsstr.h> #include "dpmsproc.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c index f79204281..162f76ad8 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c @@ -33,7 +33,7 @@ #include "xf86Module.h" #include "xf86Opt.h" -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "modinit.h" #include "globals.h" diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 2bafdb2b0..40e1828bb 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -12,26 +12,26 @@ #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/shapestr.h> +#include <nx-X11/extensions/shapestr.h> #endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/multibufst.h> #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ -#include <X11/extensions/mitmiscstr.h> +#include <nx-X11/extensions/mitmiscstr.h> #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include <X11/extensions/XTest.h> -#include <X11/extensions/xteststr.h> +#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xteststr.h> #endif #if 1 @@ -40,49 +40,49 @@ extern void XTestExtension1Init(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/extensions/bigreqstr.h> #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #define _SYNC_SERVER -#include <X11/extensions/sync.h> -#include <X11/extensions/syncstr.h> +#include <nx-X11/extensions/sync.h> +#include <nx-X11/extensions/syncstr.h> #endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); -#include <X11/extensions/saver.h> +#include <nx-X11/extensions/saver.h> #endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); -#include <X11/extensions/xcmiscstr.h> +#include <nx-X11/extensions/xcmiscstr.h> #endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ -#include <X11/extensions/xf86vmstr.h> +#include <nx-X11/extensions/xf86vmstr.h> #endif #ifdef XF86MISC extern void XFree86MiscExtensionInit(INITARGS); #define _XF86MISC_SERVER_ #define _XF86MISC_SAVER_COMPAT_ -#include <X11/extensions/xf86mscstr.h> +#include <nx-X11/extensions/xf86mscstr.h> #endif #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dgastr.h> +#include <nx-X11/extensions/xf86dgastr.h> #endif #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include <X11/extensions/dpmsstr.h> +#include <nx-X11/extensions/dpmsstr.h> #endif #ifdef FONTCACHE @@ -95,31 +95,31 @@ extern void FontCacheExtensionInit(INITARGS); #ifdef TOGCUP extern void XcupExtensionInit(INITARGS); #define _XCUP_SERVER_ -#include <X11/extensions/Xcupstr.h> +#include <nx-X11/extensions/Xcupstr.h> #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #define _XEVI_SERVER_ -#include <X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/XEVIstr.h> #endif #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); extern void XvRegister(INITARGS); -#include <X11/extensions/Xv.h> -#include <X11/extensions/XvMC.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/XvMC.h> #endif #ifdef RES extern void ResExtensionInit(INITARGS); -#include <X11/extensions/XResproto.h> +#include <nx-X11/extensions/XResproto.h> #endif #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include <X11/extensions/shmstr.h> +#include <nx-X11/extensions/shmstr.h> extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); diff --git a/nx-X11/programs/Xserver/Xext/fontcache.c b/nx-X11/programs/Xserver/Xext/fontcache.c index 9ab23a122..0956f9be9 100644 --- a/nx-X11/programs/Xserver/Xext/fontcache.c +++ b/nx-X11/programs/Xserver/Xext/fontcache.c @@ -37,8 +37,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -48,7 +48,7 @@ #define _FONTCACHE_SERVER_ #include "fontcacheP.h" #include "fontcachstr.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> #include "swaprep.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/mbuf.c b/nx-X11/programs/Xserver/Xext/mbuf.c index 37024da19..e6dec8f6f 100644 --- a/nx-X11/programs/Xserver/Xext/mbuf.c +++ b/nx-X11/programs/Xserver/Xext/mbuf.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "window.h" #include "os.h" #include "windowstr.h" @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. #include "opaque.h" #include "sleepuntil.h" #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/multibufst.h> #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/Xext/mbufbf.c b/nx-X11/programs/Xserver/Xext/mbufbf.c index 84e7ee839..318fa6756 100644 --- a/nx-X11/programs/Xserver/Xext/mbufbf.c +++ b/nx-X11/programs/Xserver/Xext/mbufbf.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #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 "os.h" #include "windowstr.h" @@ -53,7 +53,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_BUFFER_ -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/multibufst.h> /* Support for doublebuffer hardare diff --git a/nx-X11/programs/Xserver/Xext/mbufpx.c b/nx-X11/programs/Xserver/Xext/mbufpx.c index 0973fc324..0e9ae1628 100644 --- a/nx-X11/programs/Xserver/Xext/mbufpx.c +++ b/nx-X11/programs/Xserver/Xext/mbufpx.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. #endif #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 "os.h" #include "windowstr.h" @@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_PIXMAP_ -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/multibufst.h> static Bool NoopDDA_True() { return TRUE; } diff --git a/nx-X11/programs/Xserver/Xext/mitmisc.c b/nx-X11/programs/Xserver/Xext/mitmisc.c index f7b0ee55c..5c5183e69 100644 --- a/nx-X11/programs/Xserver/Xext/mitmisc.c +++ b/nx-X11/programs/Xserver/Xext/mitmisc.c @@ -34,14 +34,14 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #define _MITMISC_SERVER_ -#include <X11/extensions/mitmiscstr.h> +#include <nx-X11/extensions/mitmiscstr.h> #include "modinit.h" extern Bool permitOldBugs; diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 2dc011e70..000c4bf04 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -35,9 +35,9 @@ Equipment Corporation. #define NEED_REPLIES #include <stdio.h> -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/Xarch.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xarch.h> #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -50,7 +50,7 @@ Equipment Corporation. #include "windowstr.h" #include "pixmapstr.h" #include "panoramiX.h" -#include <X11/extensions/panoramiXproto.h> +#include <nx-X11/extensions/panoramiXproto.h> #include "panoramiXsrv.h" #include "globals.h" #include "servermd.h" diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.h b/nx-X11/programs/Xserver/Xext/panoramiX.h index 4178b985f..3f70b6473 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.h +++ b/nx-X11/programs/Xserver/Xext/panoramiX.h @@ -43,7 +43,7 @@ Equipment Corporation. #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ -#include <X11/extensions/panoramiXext.h> +#include <nx-X11/extensions/panoramiXext.h> /*#include "gcstruct.h"*/ diff --git a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c index e0548df7b..955b81ed1 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c @@ -30,8 +30,8 @@ Equipment Corporation. #endif #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 "cursor.h" #include "cursorstr.h" @@ -45,10 +45,10 @@ Equipment Corporation. #include "pixmapstr.h" #if 0 #include <sys/workstation.h> -#include <X11/Xserver/ws.h> +#include <nx-X11/Xserver/ws.h> #endif #include "panoramiX.h" -#include <X11/extensions/panoramiXproto.h> +#include <nx-X11/extensions/panoramiXproto.h> #include "panoramiXsrv.h" #include "globals.h" #include "panoramiXh.h" diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c index 79a5a3290..2f2b2c63e 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c @@ -33,10 +33,10 @@ Equipment Corporation. #endif #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "dixfontstr.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/Xext/sampleEVI.c b/nx-X11/programs/Xserver/Xext/sampleEVI.c index 500a585c9..598992742 100644 --- a/nx-X11/programs/Xserver/Xext/sampleEVI.c +++ b/nx-X11/programs/Xserver/Xext/sampleEVI.c @@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include <X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/XEVIstr.h> #include "EVIstruct.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 4a7fc054c..ec91d080a 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -36,8 +36,8 @@ in this Software without prior written authorization from the X Consortium. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#include <X11/extensions/saverproto.h> +#include <nx-X11/extensions/saverproto.h> #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 4bc49f408..bcc8574cb 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -57,19 +57,19 @@ in this Software without prior written authorization from The Open Group. #include "colormapst.h" #include "propertyst.h" #define _SECURITY_SERVER -#include <X11/extensions/securstr.h> +#include <nx-X11/extensions/securstr.h> #include <assert.h> #include <stdarg.h> #ifdef LBX #define _XLBX_SERVER_ -#include <X11/extensions/XLbx.h> +#include <nx-X11/extensions/XLbx.h> extern unsigned char LbxReqCode; #endif #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #include <stdio.h> /* for file reading operations */ -#include <X11/Xatom.h> /* for XA_STRING */ +#include <nx-X11/Xatom.h> /* for XA_STRING */ #ifdef NXAGENT_SERVER @@ -91,7 +91,7 @@ extern unsigned char LbxReqCode; #endif #if defined(WIN32) || defined(__CYGWIN__) -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #undef index #endif diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 02182398a..78d3be319 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. #include "resource.h" #include "opaque.h" #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/shapestr.h> +#include <nx-X11/extensions/shapestr.h> #include "regionstr.h" #include "gcstruct.h" #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index d500e551c..6378a55a4 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -47,8 +47,8 @@ in this Software without prior written authorization from The Open Group. #include <sys/stat.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -60,8 +60,8 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include <X11/extensions/shmstr.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/shmstr.h> +#include <nx-X11/Xfuncproto.h> #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c index da93806f5..62f946cf8 100644 --- a/nx-X11/programs/Xserver/Xext/sleepuntil.c +++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #include "sleepuntil.h" -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 006cefa86..c122e2860 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -58,9 +58,9 @@ PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xmd.h> #include "misc.h" #include "os.h" #include "extnsionst.h" @@ -68,8 +68,8 @@ PERFORMANCE OF THIS SOFTWARE. #include "resource.h" #include "opaque.h" #define _SYNC_SERVER -#include <X11/extensions/sync.h> -#include <X11/extensions/syncstr.h> +#include <nx-X11/extensions/sync.h> +#include <nx-X11/extensions/syncstr.h> #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index 0a9a09069..1d7ad0e09 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -34,14 +34,14 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include <X11/extensions/xcmiscstr.h> +#include <nx-X11/extensions/xcmiscstr.h> #include "modinit.h" #if HAVE_STDINT_H diff --git a/nx-X11/programs/Xserver/Xext/xevie.c b/nx-X11/programs/Xserver/Xext/xevie.c index 354be121f..eb38d9223 100644 --- a/nx-X11/programs/Xserver/Xext/xevie.c +++ b/nx-X11/programs/Xserver/Xext/xevie.c @@ -38,8 +38,8 @@ of the copyright holder. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -47,13 +47,13 @@ of the copyright holder. #include "scrnintstr.h" #include "servermd.h" #define _XEVIE_SERVER_ -#include <X11/extensions/Xeviestr.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/Xeviestr.h> +#include <nx-X11/Xfuncproto.h> #include "input.h" #include "inputstr.h" #include "windowstr.h" #include "cursorstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #include "../os/osdep.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 36af17622..c0cc7f938 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -64,8 +64,8 @@ #include <errno.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -74,7 +74,7 @@ #include "extnsionst.h" #define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfstr.h> +#include <nx-X11/extensions/xf86bigfstr.h> static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ diff --git a/nx-X11/programs/Xserver/Xext/xf86dga.c b/nx-X11/programs/Xserver/Xext/xf86dga.c index 9979bfb30..074118c18 100644 --- a/nx-X11/programs/Xserver/Xext/xf86dga.c +++ b/nx-X11/programs/Xserver/Xext/xf86dga.c @@ -13,8 +13,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -23,8 +23,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> +#include <nx-X11/extensions/xf86dga.h> +#include <nx-X11/extensions/xf86dgastr.h> #include "swaprep.h" #include "dgaproc.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86dga2.c b/nx-X11/programs/Xserver/Xext/xf86dga2.c index 490554d9a..c2b64b048 100644 --- a/nx-X11/programs/Xserver/Xext/xf86dga2.c +++ b/nx-X11/programs/Xserver/Xext/xf86dga2.c @@ -12,8 +12,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "dixevents.h" @@ -24,8 +24,8 @@ #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> +#include <nx-X11/extensions/xf86dga.h> +#include <nx-X11/extensions/xf86dgastr.h> #include "swaprep.h" #include "dgaproc.h" #include "xf86dgaext.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86misc.c b/nx-X11/programs/Xserver/Xext/xf86misc.c index 6de794e1f..ccf983fae 100644 --- a/nx-X11/programs/Xserver/Xext/xf86misc.c +++ b/nx-X11/programs/Xserver/Xext/xf86misc.c @@ -12,8 +12,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -22,16 +22,16 @@ #include "servermd.h" #define _XF86MISC_SERVER_ #undef _XF86MISC_SAVER_COMPAT_ -#include <X11/extensions/xf86mscstr.h> +#include <nx-X11/extensions/xf86mscstr.h> #include "swaprep.h" #include "xf86.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> #include "xf86miscproc.h" #if 0 -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "../os/osdep.h" -#include <X11/Xauth.h> +#include <nx-X11/Xauth.h> #ifndef USL #ifndef Lynx #include <sys/socket.h> diff --git a/nx-X11/programs/Xserver/Xext/xf86vmode.c b/nx-X11/programs/Xserver/Xext/xf86vmode.c index 979f55c00..0595343c9 100644 --- a/nx-X11/programs/Xserver/Xext/xf86vmode.c +++ b/nx-X11/programs/Xserver/Xext/xf86vmode.c @@ -39,15 +39,15 @@ from Kaleb S. KEITHLEY #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" #include "servermd.h" #define _XF86VIDMODE_SERVER_ -#include <X11/extensions/xf86vmstr.h> +#include <nx-X11/extensions/xf86vmstr.h> #include "swaprep.h" #include "xf86.h" #include "vidmodeproc.h" diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index dc4018dd7..7b3555452 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -10,14 +10,14 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include <X11/extensions/XResproto.h> +#include <nx-X11/extensions/XResproto.h> #include "pixmapstr.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index 994b0c502..d9adc03c0 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -33,9 +33,9 @@ from The Open Group. #include <dix-config.h> #endif -#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 "os.h" #include "dixstruct.h" @@ -46,11 +46,11 @@ from The Open Group. #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include <X11/extensions/XTest.h> -#include <X11/extensions/xteststr.h> +#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xteststr.h> #ifdef XINPUT -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #define EXTENSION_EVENT_BASE 64 #include "extinit.h" /* LookupDeviceIntRec */ #endif /* XINPUT */ diff --git a/nx-X11/programs/Xserver/Xext/xtest1dd.c b/nx-X11/programs/Xserver/Xext/xtest1dd.c index c78cceed0..c945fd6bd 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1dd.c +++ b/nx-X11/programs/Xserver/Xext/xtest1dd.c @@ -66,14 +66,14 @@ University of California. #endif #include <stdio.h> -#include <X11/Xos.h> -#include <X11/X.h> -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <nx-X11/Xos.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #define XTestSERVER_SIDE -#include <X11/extensions/xtestext1.h> +#include <nx-X11/extensions/xtestext1.h> #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c index 985193a89..e7c3522ba 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1di.c +++ b/nx-X11/programs/Xserver/Xext/xtest1di.c @@ -67,8 +67,8 @@ University of California. #endif #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 "os.h" #include "gcstruct.h" @@ -76,7 +76,7 @@ University of California. #include "dixstruct.h" #include "opaque.h" #define XTestSERVER_SIDE -#include <X11/extensions/xtestext1.h> +#include <nx-X11/extensions/xtestext1.h> #include "modinit.h" #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index b361c0ff3..8037e6c45 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -52,8 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -63,12 +63,12 @@ SOFTWARE. #include "resource.h" #include "opaque.h" -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvproto.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <X11/extensions/shmstr.h> +#include <nx-X11/extensions/shmstr.h> #endif #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/xvdix.h b/nx-X11/programs/Xserver/Xext/xvdix.h index 99d918406..6e6e07302 100644 --- a/nx-X11/programs/Xserver/Xext/xvdix.h +++ b/nx-X11/programs/Xserver/Xext/xvdix.h @@ -54,7 +54,7 @@ SOFTWARE. */ #include "scrnintstr.h" -#include <X11/extensions/Xvproto.h> +#include <nx-X11/extensions/Xvproto.h> extern int XvScreenIndex; extern unsigned long XvExtensionGeneration; diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c index bbbb34dcf..571bb9c46 100644 --- a/nx-X11/programs/Xserver/Xext/xvmain.c +++ b/nx-X11/programs/Xserver/Xext/xvmain.c @@ -79,8 +79,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "scrnintstr.h" @@ -95,8 +95,8 @@ SOFTWARE. #define GLOBAL -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvproto.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index 30de35a2b..b1441fa1d 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -6,8 +6,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -15,11 +15,11 @@ #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> #include "xvdix.h" -#include <X11/extensions/XvMC.h> -#include <X11/extensions/Xvproto.h> -#include <X11/extensions/XvMCproto.h> +#include <nx-X11/extensions/XvMC.h> +#include <nx-X11/extensions/Xvproto.h> +#include <nx-X11/extensions/XvMCproto.h> #include "xvmcext.h" #ifdef HAS_XVMCSHM diff --git a/nx-X11/programs/Xserver/Xext/xvmcext.h b/nx-X11/programs/Xserver/Xext/xvmcext.h index 7cb8af24d..b92a53225 100644 --- a/nx-X11/programs/Xserver/Xext/xvmcext.h +++ b/nx-X11/programs/Xserver/Xext/xvmcext.h @@ -2,7 +2,7 @@ #ifndef _XVMC_H #define _XVMC_H -#include <X11/extensions/Xv.h> +#include <nx-X11/extensions/Xv.h> #include "xvdix.h" typedef struct { diff --git a/nx-X11/programs/Xserver/Xext/xvmod.c b/nx-X11/programs/Xserver/Xext/xvmod.c index 7899f3a75..258023f65 100644 --- a/nx-X11/programs/Xserver/Xext/xvmod.c +++ b/nx-X11/programs/Xserver/Xext/xvmod.c @@ -4,12 +4,12 @@ #include <xorg-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "scrnintstr.h" #include "gc.h" -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvproto.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/Xvproto.h> #include "xvdix.h" #include "xvmodproc.h" diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index c1df7eb73..8073649f1 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index 144a51ed4..c4fa46ba7 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> /* control constants */ +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> /* control constants */ #include "XIstubs.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c index 3ffac39b3..d78b32a17 100644 --- a/nx-X11/programs/Xserver/Xi/chgfctl.c +++ b/nx-X11/programs/Xserver/Xi/chgfctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> /* control constants */ +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> /* control constants */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c index a8a6024d8..136d257c6 100644 --- a/nx-X11/programs/Xserver/Xi/chgkbd.c +++ b/nx-X11/programs/Xserver/Xi/chgkbd.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "globals.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c index 3df376d9a..88afd9df7 100644 --- a/nx-X11/programs/Xserver/Xi/chgkmap.c +++ b/nx-X11/programs/Xserver/Xi/chgkmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c index 6e345d554..47db87293 100644 --- a/nx-X11/programs/Xserver/Xi/chgprop.c +++ b/nx-X11/programs/Xserver/Xi/chgprop.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c index bf2abd6b6..925d43c07 100644 --- a/nx-X11/programs/Xserver/Xi/chgptr.c +++ b/nx-X11/programs/Xserver/Xi/chgptr.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c index 8a57aeeee..ae46f50c6 100644 --- a/nx-X11/programs/Xserver/Xi/closedev.c +++ b/nx-X11/programs/Xserver/Xi/closedev.c @@ -59,13 +59,13 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c index 190e32086..12c444137 100644 --- a/nx-X11/programs/Xserver/Xi/devbell.c +++ b/nx-X11/programs/Xserver/Xi/devbell.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c index f0c9aea3d..ce5fe9ec9 100644 --- a/nx-X11/programs/Xserver/Xi/exevents.c +++ b/nx-X11/programs/Xserver/Xi/exevents.c @@ -59,10 +59,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "inputstr.h" #include "windowstr.h" #include "miscstruct.h" diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c index 0b27b5cf7..750fa46cb 100644 --- a/nx-X11/programs/Xserver/Xi/extinit.c +++ b/nx-X11/programs/Xserver/Xi/extinit.c @@ -61,13 +61,13 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "inputstr.h" #include "gcstruct.h" /* pointer for extnsionst.h*/ #include "extnsionst.h" /* extension entry */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "dixevents.h" #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c index a944d4cc8..ac2b69749 100644 --- a/nx-X11/programs/Xserver/Xi/getbmap.c +++ b/nx-X11/programs/Xserver/Xi/getbmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c index 527273ac4..d8c310d92 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.c +++ b/nx-X11/programs/Xserver/Xi/getdctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c index 5652ad303..c6cb8457c 100644 --- a/nx-X11/programs/Xserver/Xi/getfctl.c +++ b/nx-X11/programs/Xserver/Xi/getfctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 3c1597cc9..61a98f1bf 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c index 4e67d9c71..fe8fd9b22 100644 --- a/nx-X11/programs/Xserver/Xi/getkmap.c +++ b/nx-X11/programs/Xserver/Xi/getkmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c index 6b2e38d0b..203799103 100644 --- a/nx-X11/programs/Xserver/Xi/getmmap.c +++ b/nx-X11/programs/Xserver/Xi/getmmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> /* Request macro */ +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> /* Request macro */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c index 2b4de1f3e..ac37617ec 100644 --- a/nx-X11/programs/Xserver/Xi/getprop.c +++ b/nx-X11/programs/Xserver/Xi/getprop.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structs */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c index c2ec2b9d5..7cd97b5ef 100644 --- a/nx-X11/programs/Xserver/Xi/getselev.c +++ b/nx-X11/programs/Xserver/Xi/getselev.c @@ -59,10 +59,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index 3a335dd31..7743e797f 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c index 21e920a35..865263688 100644 --- a/nx-X11/programs/Xserver/Xi/grabdev.c +++ b/nx-X11/programs/Xserver/Xi/grabdev.c @@ -60,12 +60,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c index ad43c29a0..9a20345be 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevb.c +++ b/nx-X11/programs/Xserver/Xi/grabdevb.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 952c5d89a..73b8690b9 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c index 02b1fee32..ec26ae407 100644 --- a/nx-X11/programs/Xserver/Xi/gtmotion.c +++ b/nx-X11/programs/Xserver/Xi/gtmotion.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 6228352f5..e99584d0e 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 520c6832a..054dae159 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index 34b140c8e..af2b4301d 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -40,12 +40,12 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c index a9b731864..de29fcf59 100644 --- a/nx-X11/programs/Xserver/Xi/selectev.c +++ b/nx-X11/programs/Xserver/Xi/selectev.c @@ -60,12 +60,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index 0b2a701bb..9decfadab 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -60,12 +60,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c index 37db5110d..74b8e3c05 100644 --- a/nx-X11/programs/Xserver/Xi/setbmap.c +++ b/nx-X11/programs/Xserver/Xi/setbmap.c @@ -62,11 +62,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index 9b5b1e20d..04f55d4fc 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c index a1dd09d71..b9a495612 100644 --- a/nx-X11/programs/Xserver/Xi/setfocus.c +++ b/nx-X11/programs/Xserver/Xi/setfocus.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "dixevents.h" diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 3fa2c7e7e..9fd8e7244 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c index f95ef5514..17c46515d 100644 --- a/nx-X11/programs/Xserver/Xi/setmode.c +++ b/nx-X11/programs/Xserver/Xi/setmode.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c index 2d9aad08b..33c55d3b7 100644 --- a/nx-X11/programs/Xserver/Xi/stubs.c +++ b/nx-X11/programs/Xserver/Xi/stubs.c @@ -62,11 +62,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "inputstr.h" -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" /*********************************************************************** diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c index 8de4cd225..b318fa044 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdev.c +++ b/nx-X11/programs/Xserver/Xi/ungrdev.c @@ -59,11 +59,11 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c index 8927a5c6e..a76f9692c 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevb.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c index 38cfa1b71..928b602f1 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevk.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c @@ -59,12 +59,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/composite/compint.h b/nx-X11/programs/Xserver/composite/compint.h index 9a6a22f48..262d95108 100644 --- a/nx-X11/programs/Xserver/composite/compint.h +++ b/nx-X11/programs/Xserver/composite/compint.h @@ -50,7 +50,7 @@ #include "damage.h" #include "damageextint.h" #include "xfixes.h" -#include <X11/extensions/compositeproto.h> +#include <nx-X11/extensions/compositeproto.h> #include <assert.h> /* diff --git a/nx-X11/programs/Xserver/damageext/damageextint.h b/nx-X11/programs/Xserver/damageext/damageextint.h index ab00effe3..d2f9d71ac 100644 --- a/nx-X11/programs/Xserver/damageext/damageextint.h +++ b/nx-X11/programs/Xserver/damageext/damageextint.h @@ -30,8 +30,8 @@ #define _DAMAGEEXTINT_H_ #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index ad5294a4c..064987dec 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -41,8 +41,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "extnsionst.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/dbe/dbestruct.h b/nx-X11/programs/Xserver/dbe/dbestruct.h index 69135a837..43c4c525b 100644 --- a/nx-X11/programs/Xserver/dbe/dbestruct.h +++ b/nx-X11/programs/Xserver/dbe/dbestruct.h @@ -39,7 +39,7 @@ /* INCLUDES */ #define NEED_DBE_PROTOCOL -#include <X11/extensions/Xdbeproto.h> +#include <nx-X11/extensions/Xdbeproto.h> #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 042f95953..b8383e11a 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -41,8 +41,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c index 207174280..583f2dafc 100644 --- a/nx-X11/programs/Xserver/dix/atom.c +++ b/nx-X11/programs/Xserver/dix/atom.c @@ -52,8 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xatom.h> +#include <nx-X11/X.h> +#include <nx-X11/Xatom.h> #include "misc.h" #include "resource.h" #include "dix.h" diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index 32d9bae89..11a353f84 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -53,9 +53,9 @@ SOFTWARE. #include <dix-config.h> #endif -#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 "dix.h" #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index 187dd62c5..1e1dba36b 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -53,8 +53,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 917a3849a..91a92644c 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -54,12 +54,12 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -68,11 +68,11 @@ SOFTWARE. #include "site.h" #define XKB_IN_SERVER #ifdef XKB -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 71c22ae0e..b6010e627 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -109,15 +109,15 @@ int ProcInitialConnection(); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index fac918963..6e515300d 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -56,9 +56,9 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" @@ -139,7 +139,7 @@ _NXGetFontPathError: #ifdef XF86BIGFONT #define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfont.h> +#include <nx-X11/extensions/xf86bigfont.h> #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index f3b3373d0..8bcfce619 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -88,18 +88,18 @@ Author: Adobe Systems Incorporated #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "dixstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" #define XK_LATIN1 -#include <X11/keysymdef.h> +#include <nx-X11/keysymdef.h> #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif /* diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index ab995a772..1166bf84b 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -115,12 +115,12 @@ of the copyright holder. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -134,13 +134,13 @@ of the copyright holder. #include "globals.h" #ifdef XKB -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef XEVIE @@ -157,7 +157,7 @@ int xeviegrabState = 0; xEvent *xeviexE; #endif -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index 19333c151..dd6de9c63 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -51,10 +51,10 @@ SOFTWARE. #include <dix-config.h> #endif -#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 "dixstruct.h" #include "extnsionst.h" @@ -63,7 +63,7 @@ SOFTWARE. #include "dispatch.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c index 834919946..2c17de3d6 100644 --- a/nx-X11/programs/Xserver/dix/gc.c +++ b/nx-X11/programs/Xserver/dix/gc.c @@ -52,9 +52,9 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "resource.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 15eedf602..e4f43fd01 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -53,8 +53,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c index e133c0dfc..839e930b1 100644 --- a/nx-X11/programs/Xserver/dix/grabs.c +++ b/nx-X11/programs/Xserver/dix/grabs.c @@ -52,10 +52,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #define NEED_EVENTS -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "cursorstr.h" diff --git a/nx-X11/programs/Xserver/dix/initatoms.c b/nx-X11/programs/Xserver/dix/initatoms.c index a5972afd6..5f6244a76 100644 --- a/nx-X11/programs/Xserver/dix/initatoms.c +++ b/nx-X11/programs/Xserver/dix/initatoms.c @@ -7,8 +7,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xatom.h> +#include <nx-X11/X.h> +#include <nx-X11/Xatom.h> #include "misc.h" #include "dix.h" void MakePredeclaredAtoms() diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 954c260c2..6a5b0021d 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -84,9 +84,9 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xos.h> /* for unistd.h */ -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xos.h> /* for unistd.h */ +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" @@ -113,7 +113,7 @@ Equipment Corporation. #ifdef DPMSExtension #define DPMS_SERVER -#include <X11/extensions/dpms.h> +#include <nx-X11/extensions/dpms.h> #include "dpmsproc.h" #endif diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c index 7888cf90a..463e31598 100644 --- a/nx-X11/programs/Xserver/dix/pixmap.c +++ b/nx-X11/programs/Xserver/dix/pixmap.c @@ -32,7 +32,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/dix/privates.c b/nx-X11/programs/Xserver/dix/privates.c index 36bbc65d1..d08883d1d 100644 --- a/nx-X11/programs/Xserver/dix/privates.c +++ b/nx-X11/programs/Xserver/dix/privates.c @@ -33,7 +33,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index f462a3ebd..51cbc1a0d 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -51,10 +51,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "propertyst.h" #include "dixstruct.h" @@ -62,7 +62,7 @@ SOFTWARE. #include "swaprep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c index e0fc2b997..ed8a255f5 100644 --- a/nx-X11/programs/Xserver/dix/resource.c +++ b/nx-X11/programs/Xserver/dix/resource.c @@ -106,7 +106,7 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "os.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c index 9776cd437..b8f245408 100644 --- a/nx-X11/programs/Xserver/dix/swaprep.c +++ b/nx-X11/programs/Xserver/dix/swaprep.c @@ -52,10 +52,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include <X11/fonts/fontstruct.h> diff --git a/nx-X11/programs/Xserver/dix/swapreq.c b/nx-X11/programs/Xserver/dix/swapreq.c index 7d57d551f..35a7e7527 100644 --- a/nx-X11/programs/Xserver/dix/swapreq.c +++ b/nx-X11/programs/Xserver/dix/swapreq.c @@ -52,10 +52,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS -#include <X11/Xproto.h> -#include <X11/Xprotostr.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xprotostr.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" /* for SendEvent */ diff --git a/nx-X11/programs/Xserver/dix/tables.c b/nx-X11/programs/Xserver/dix/tables.c index 5196f0e85..eb4f4c8d2 100644 --- a/nx-X11/programs/Xserver/dix/tables.c +++ b/nx-X11/programs/Xserver/dix/tables.c @@ -51,10 +51,10 @@ SOFTWARE. #include <dix-config.h> #endif -#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 "windowstr.h" #include "extnsionst.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 340ca50cc..5854f2e95 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -105,11 +105,11 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif /****** diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h index 202638d32..b64f3a227 100644 --- a/nx-X11/programs/Xserver/fb/fb.h +++ b/nx-X11/programs/Xserver/fb/fb.h @@ -27,7 +27,7 @@ #ifndef _FB_H_ #define _FB_H_ -#include <X11/X.h> +#include <nx-X11/X.h> #include "scrnintstr.h" #include "pixmap.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c index 762c51c9d..a7c8ca638 100644 --- a/nx-X11/programs/Xserver/fb/fbcmap.c +++ b/nx-X11/programs/Xserver/fb/fbcmap.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c index 83d556a0e..469f3ea08 100644 --- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c +++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c @@ -2,8 +2,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "glyphstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index dbed1e0d8..ec312bad2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -103,8 +103,8 @@ typedef XID KeySym64; #define NX_TRANS_SOCKET #define GC XlibGC -#include "Xlib.h" -#include "X11/extensions/shape.h" +#include <nx-X11/Xlib.h> +#include <nx-X11/extensions/shape.h> #undef GC #ifdef _XSERVER64_tmp diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 557798e7f..21bcc60e5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -33,7 +33,7 @@ #include "gcstruct.h" #include "xfixeswire.h" -#include <X11/extensions/Xfixes.h> +#include <nx-X11/extensions/Xfixes.h> /* * Use asyncronous get property replies. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 0fb9491a4..63c3b73c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -25,7 +25,7 @@ #include "scrnintstr.h" #include "Agent.h" -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #include "opaque.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 862ce57d0..abc6a9380 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -38,8 +38,8 @@ is" without express or implied warranty. #include <time.h> #include <errno.h> -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index c33564092..d965d574c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -66,7 +66,7 @@ #define Window XlibWindow #define Atom XlibAtom #define Time XlibXID -#include <X11/extensions/Xfixes.h> +#include <nx-X11/extensions/Xfixes.h> #undef Window #undef Atom #undef Time @@ -90,10 +90,10 @@ #undef KeySym #undef XID -#include <X11/cursorfont.h> +#include <nx-X11/cursorfont.h> #include "Shadow.h" -#include <X11/extensions/Xrandr.h> +#include "X11/include/Xrandr_nxagent.h" #include "NXlib.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h index c74fa151f..02b2b8cbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h @@ -18,7 +18,7 @@ #ifndef __Events_H__ #define __Events_H__ -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #define ProcessedExpose (LASTEvent + 1) #define ProcessedNotify (LASTEvent + 2) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c index 4aca1ecdb..64ffb24a4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c @@ -33,7 +33,7 @@ #include "../../include/gc.h" #include "../../include/window.h" -#include <X11/xpm.h> +#include "X11/include/xpm_nxagent.h" #include "Agent.h" #include "Pixmaps.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/nx-X11/programs/Xserver/hw/nxagent/Icons.h index 98e879662..b307f42e6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h @@ -19,7 +19,7 @@ #define __Icons_H__ #define Pixel XpmPixel -#include <X11/xpm.h> +#include "X11/include/xpm_nxagent.h" #undef Pixel #define NXAGENT_ICON_NAME "nxagent.xpm" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 835aebeb6..9ead48de1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -64,13 +64,13 @@ is" without express or implied warranty. #include "property.h" #include "Init.h" -#include <X11/extensions/XKB.h> +#include <nx-X11/extensions/XKB.h> #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBconfig.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBconfig.h> -#include "X11/extensions/XKBrules.h" +#include <nx-X11/extensions/XKBrules.h> #include "Xatom.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h index d11561e18..a274b8a39 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h @@ -33,12 +33,12 @@ #else -#include <X11/extensions/composite.h> -#include <X11/extensions/Xfixes.h> +#include <nx-X11/extensions/composite.h> +#include <nx-X11/extensions/Xfixes.h> #endif -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h index 8667ded16..b4433d6c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h @@ -27,7 +27,7 @@ #ifndef NXAGENT_SERVER -#include <X11/extensions/xfixeswire.h> +#include <nx-X11/extensions/xfixeswire.h> #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index af76ed4c2..704bfcc0d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -109,12 +109,13 @@ int ProcInitialConnection(); #define True 1 #endif +#include <X11/fonts/fontstruct.h> + #define GC XlibGC -#include <X11/Xlib.h> +#include <nx-X11/Xlib.h> #undef GC #include "windowstr.h" -#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "selection.h" @@ -135,15 +136,15 @@ int ProcInitialConnection(); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif #include "Atoms.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 4f41ee228..2f3a75147 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -73,16 +73,16 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <X11/fonts/fontstruct.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" #include "cursorstr.h" #include "misc.h" #include "opaque.h" -#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "closestr.h" @@ -172,7 +172,7 @@ _NXGetFontPathError: #ifdef XF86BIGFONT #define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfont.h> +#include <nx-X11/extensions/xf86bigfont.h> #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 5940fe7d1..11ff62947 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -132,13 +132,13 @@ of the copyright holder. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "Xlib.h" #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -152,13 +152,13 @@ of the copyright holder. #include "globals.h" #ifdef XKB -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef XEVIE @@ -175,7 +175,7 @@ int xeviegrabState = 0; xEvent *xeviexE; #endif -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index f964e2fd8..962367bf2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -68,10 +68,10 @@ SOFTWARE. #include <dix-config.h> #endif -#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 "dixstruct.h" #include "extnsionst.h" @@ -80,7 +80,7 @@ SOFTWARE. #include "../../dix/dispatch.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h index e7bb2d841..5d7fcf640 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h @@ -50,7 +50,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include <X11/extensions/renderproto.h> +#include <nx-X11/extensions/renderproto.h> #include "../../render/picture.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c index e1c6b6d8c..aa3c606f8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c @@ -97,10 +97,10 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS -#include <X11/Xproto.h> -#include <X11/Xprotostr.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xprotostr.h> #include "misc.h" #include "regionstr.h" @@ -112,7 +112,7 @@ Equipment Corporation. #include "dixstruct.h" #include "mi.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "globals.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c index 8132e9dd0..a720cafbf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c @@ -67,7 +67,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "regionstr.h" #include "region.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index a2d4a8e52..d6c5aa4dd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -68,10 +68,10 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "windowstr.h" #include "propertyst.h" #include "dixstruct.h" @@ -79,7 +79,7 @@ SOFTWARE. #include "swaprep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 260355c6e..dc1d2387e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -47,8 +47,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -59,9 +59,9 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include <X11/extensions/render.h> -#include <X11/extensions/renderproto.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/render.h> +#include <nx-X11/extensions/renderproto.h> +#include <nx-X11/Xfuncproto.h> #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index 833a33fd3..39a1992de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -123,7 +123,7 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "os.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 3b40b82f7..95905fde7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -64,8 +64,8 @@ in this Software without prior written authorization from The Open Group. #include <sys/stat.h> #define NEED_REPLIES #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -77,8 +77,8 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include <X11/extensions/shmstr.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/shmstr.h> +#include <nx-X11/Xfuncproto.h> #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 4017099e9..4552ad563 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -123,11 +123,11 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #include "Screen.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c index cfce34463..1724374a0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c @@ -71,8 +71,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -82,12 +82,12 @@ SOFTWARE. #include "resource.h" #include "opaque.h" -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvproto.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <X11/extensions/shmstr.h> +#include <nx-X11/extensions/shmstr.h> #endif #include "Trap.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 095aa7b08..491a92c2f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -77,13 +77,13 @@ is" without express or implied warranty. #include "Shadow.h" #include "Utils.h" -#include <X11/extensions/Xrandr.h> +#include "X11/include/Xrandr_nxagent.h" #define GC XlibGC #define Font XlibFont #define KeySym XlibKeySym #define XID XlibXID -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> #undef GC #undef Font #undef KeySym diff --git a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c index 6bce2eaeb..30fe1968e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c +++ b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c @@ -29,9 +29,9 @@ is" without express or implied warranty. */ -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/Xlib.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xlib.h> #undef Bool #include "screenint.h" #include "input.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h new file mode 100644 index 000000000..acfc5834e --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h @@ -0,0 +1,105 @@ +/* + * Copyright © 2000 Compaq Computer Corporation, Inc. + * Copyright © 2002 Hewlett-Packard Company, Inc. + * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc. + * Keith Packard, Intel Corporation + */ + +/* + * This file is a reduced version of the header file of + * <X11/extensions/Xrandr.h> + * + * This copy of code has been introduced to allow a clear namespace + * separation between <X11/...> and <nx-X11/...> header files. + * + * This version of the Xrandr library header file only contains symbols + * required by nxagent and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using <X11/extensions/Xrandr.h> instead for inclusion in + * nxagent, it will attempt pulling in the <X11/extensions/Xrender.h> + * header which in turn will include <X11/Xlib.h>. However, the headers of + * the same name from <nx-X11/...> should be used instead. + * + * FIXME: Once the nxagent Xserver starts using libXrender from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + */ + +#ifndef _XRANDR_H_ +#define _XRANDR_H_ + +#include <X11/extensions/randr.h> +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + +typedef XID RRProvider; +typedef XID RRMode; + +/* + * Events. + */ + +typedef struct { + int type; /* event base */ + unsigned long serial; /* # of last request processed by server */ + Bool send_event; /* true if this came from a SendEvent request */ + Display *display; /* Display the event was read from */ + Window window; /* window which selected for this event */ + Window root; /* Root window for changed screen */ + Time timestamp; /* when the screen change occurred */ + Time config_timestamp; /* when the last configuration change */ + SizeID size_index; + SubpixelOrder subpixel_order; + Rotation rotation; + int width; + int height; + int mwidth; + int mheight; +} XRRScreenChangeNotifyEvent; + +typedef unsigned long XRRModeFlags; + +typedef struct _XRRModeInfo { + RRMode id; + unsigned int width; + unsigned int height; + unsigned long dotClock; + unsigned int hSyncStart; + unsigned int hSyncEnd; + unsigned int hTotal; + unsigned int hSkew; + unsigned int vSyncStart; + unsigned int vSyncEnd; + unsigned int vTotal; + char *name; + unsigned int nameLength; + XRRModeFlags modeFlags; +} XRRModeInfo; + +_XFUNCPROTOEND + +#endif /* _XRANDR_H_ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h new file mode 100644 index 000000000..b02e5a913 --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h @@ -0,0 +1,259 @@ +/* + * Copyright (C) 1989-95 GROUPE BULL + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of GROUPE BULL shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from GROUPE BULL. + */ + +/*****************************************************************************\ +* xpm.h: * +* * +* XPM library * +* Include file * +* * +* Developed by Arnaud Le Hors * +\*****************************************************************************/ + +/* + * This file is a reduced version of the header file of + * <X11/xpm.h> + * + * This copy of code has been introduced to allow a clear namespace + * separation between <X11/...> and <nx-X11/...> header files. + * + * This version of the Xpm library header file only contains symbols + * required by nxagent and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using <X11/xpm.h> instead for inclusion in nxagent, it will + * attempt pulling in the <X11/extensions/Xlib.h> header file. + * However, the headers of the same name from <nx-X11/...> should be + * used instead. + * + * FIXME: Once the nxagent Xserver starts using libX11 from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + */ + +#ifndef XPM_h +#define XPM_h + +/* + * first some identification numbers: + * the version and revision numbers are determined with the following rule: + * SO Major number = LIB minor version number. + * SO Minor number = LIB sub-minor version number. + * e.g: Xpm version 3.2f + * we forget the 3 which is the format number, 2 gives 2, and f gives 6. + * thus we have XpmVersion = 2 and XpmRevision = 6 + * which gives SOXPMLIBREV = 2.6 + * + * Then the XpmIncludeVersion number is built from these numbers. + */ +#define XpmFormat 3 +#define XpmVersion 4 +#define XpmRevision 11 +#define XpmIncludeVersion ((XpmFormat * 100 + XpmVersion) * 100 + XpmRevision) + +#ifndef XPM_NUMBERS + +/* let's define Pixel if it is not done yet */ +#if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED) +typedef unsigned long Pixel; /* Index into colormap */ +# define PIXEL_ALREADY_TYPEDEFED +#endif + +/* include headers from <nx-X11/...> instead of <X11/...> */ +#include <nx-X11/Xlib.h> +#include <nx-X11/Xutil.h> + +/* Return ErrorStatus codes: + * null if full success + * positive if partial success + * negative if failure + */ + +#define XpmColorError 1 +#define XpmSuccess 0 +#define XpmOpenFailed -1 +#define XpmFileInvalid -2 +#define XpmNoMemory -3 +#define XpmColorFailed -4 + +typedef struct { + char *name; /* Symbolic color name */ + char *value; /* Color value */ + Pixel pixel; /* Color pixel */ +} XpmColorSymbol; + +typedef struct { + char *name; /* name of the extension */ + unsigned int nlines; /* number of lines in this extension */ + char **lines; /* pointer to the extension array of strings */ +} XpmExtension; + +typedef struct { + char *string; /* characters string */ + char *symbolic; /* symbolic name */ + char *m_color; /* monochrom default */ + char *g4_color; /* 4 level grayscale default */ + char *g_color; /* other level grayscale default */ + char *c_color; /* color default */ +} XpmColor; + +typedef struct { + unsigned int width; /* image width */ + unsigned int height; /* image height */ + unsigned int cpp; /* number of characters per pixel */ + unsigned int ncolors; /* number of colors */ + XpmColor *colorTable; /* list of related colors */ + unsigned int *data; /* image data */ +} XpmImage; + +typedef struct { + unsigned long valuemask; /* Specifies which attributes are defined */ + char *hints_cmt; /* Comment of the hints section */ + char *colors_cmt; /* Comment of the colors section */ + char *pixels_cmt; /* Comment of the pixels section */ + unsigned int x_hotspot; /* Returns the x hotspot's coordinate */ + unsigned int y_hotspot; /* Returns the y hotspot's coordinate */ + unsigned int nextensions; /* number of extensions */ + XpmExtension *extensions; /* pointer to array of extensions */ +} XpmInfo; + +typedef int (*XpmAllocColorFunc)( + Display* /* display */, + Colormap /* colormap */, + char* /* colorname */, + XColor* /* xcolor */, + void* /* closure */ +); + +typedef int (*XpmFreeColorsFunc)( + Display* /* display */, + Colormap /* colormap */, + Pixel* /* pixels */, + int /* npixels */, + void* /* closure */ +); + + +/* required struct for hw/nxagent/Holder.c */ +typedef struct { + unsigned long valuemask; /* Specifies which attributes are + defined */ + + Visual *visual; /* Specifies the visual to use */ + Colormap colormap; /* Specifies the colormap to use */ + unsigned int depth; /* Specifies the depth */ + unsigned int width; /* Returns the width of the created + pixmap */ + unsigned int height; /* Returns the height of the created + pixmap */ + unsigned int x_hotspot; /* Returns the x hotspot's + coordinate */ + unsigned int y_hotspot; /* Returns the y hotspot's + coordinate */ + unsigned int cpp; /* Specifies the number of char per + pixel */ + Pixel *pixels; /* List of used color pixels */ + unsigned int npixels; /* Number of used pixels */ + XpmColorSymbol *colorsymbols; /* List of color symbols to override */ + unsigned int numsymbols; /* Number of symbols */ + char *rgb_fname; /* RGB text file name */ + unsigned int nextensions; /* Number of extensions */ + XpmExtension *extensions; /* List of extensions */ + + unsigned int ncolors; /* Number of colors */ + XpmColor *colorTable; /* List of colors */ +/* 3.2 backward compatibility code */ + char *hints_cmt; /* Comment of the hints section */ + char *colors_cmt; /* Comment of the colors section */ + char *pixels_cmt; /* Comment of the pixels section */ +/* end 3.2 bc */ + unsigned int mask_pixel; /* Color table index of transparent + color */ + + /* Color Allocation Directives */ + Bool exactColors; /* Only use exact colors for visual */ + unsigned int closeness; /* Allowable RGB deviation */ + unsigned int red_closeness; /* Allowable red deviation */ + unsigned int green_closeness; /* Allowable green deviation */ + unsigned int blue_closeness; /* Allowable blue deviation */ + int color_key; /* Use colors from this color set */ + + Pixel *alloc_pixels; /* Returns the list of alloc'ed color + pixels */ + int nalloc_pixels; /* Returns the number of alloc'ed + color pixels */ + + Bool alloc_close_colors; /* Specify whether close colors should + be allocated using XAllocColor + or not */ + int bitmap_format; /* Specify the format of 1bit depth + images: ZPixmap or XYBitmap */ + + /* Color functions */ + XpmAllocColorFunc alloc_color; /* Application color allocator */ + XpmFreeColorsFunc free_colors; /* Application color de-allocator */ + void *color_closure; /* Application private data to pass to + alloc_color and free_colors */ + +} XpmAttributes; + +/* XpmAttributes value masks bits */ + +/* required masks bits for hw/nxagent/Holder.c */ +#define XpmDepth (1L<<2) +#define XpmSize (1L<<3) /* width & height */ + +/* macros for forward declarations of functions with prototypes */ +#define FUNC(f, t, p) extern t f p +#define LFUNC(f, t, p) static t f p + + +/* + * functions declarations (for building nxagent against system wide libXpm4, + * but also against libNX_X11 (as opposed to system-wide libX11). + */ + +_XFUNCPROTOBEGIN + +/* Keep for hw/nxagent/Holder.c */ +FUNC(XpmCreatePixmapFromData, int, (Display *display, + Drawable d, + char **data, + Pixmap *pixmap_return, + Pixmap *shapemask_return, + XpmAttributes *attributes)); +/* Keep for hw/nxagent/Display.c */ +FUNC(XpmReadFileToPixmap, int, (Display *display, + Drawable d, + const char *filename, + Pixmap *pixmap_return, + Pixmap *shapemask_return, + XpmAttributes *attributes)); + +_XFUNCPROTOEND + +#endif /* XPM_NUMBERS */ +#endif diff --git a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h index c51e0ee14..ca68c1b63 100644 --- a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h +++ b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h @@ -45,7 +45,7 @@ #ifndef XF86_LIBC_H #define XF86_LIBC_H 1 -#include <X11/Xfuncs.h> +#include <nx-X11/Xfuncs.h> #include <stddef.h> /* diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index d68ef940c..4c9b169a4 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -63,5 +63,5 @@ InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR)) -BuildIncludes($(HEADERS),X11,..) -InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) +BuildIncludes($(HEADERS),nx-X11,..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) diff --git a/nx-X11/programs/Xserver/include/closestr.h b/nx-X11/programs/Xserver/include/closestr.h index c06010113..31b5693f5 100644 --- a/nx-X11/programs/Xserver/include/closestr.h +++ b/nx-X11/programs/Xserver/include/closestr.h @@ -33,7 +33,7 @@ from The Open Group. #define CLOSESTR_H #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "closure.h" #include "dix.h" #include "misc.h" diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h index d519bb782..67f44193d 100644 --- a/nx-X11/programs/Xserver/include/colormap.h +++ b/nx-X11/programs/Xserver/include/colormap.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef CMAP_H #define CMAP_H 1 -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "screenint.h" #include "window.h" diff --git a/nx-X11/programs/Xserver/include/dixfontstr.h b/nx-X11/programs/Xserver/include/dixfontstr.h index 948bf1adb..09a162451 100644 --- a/nx-X11/programs/Xserver/include/dixfontstr.h +++ b/nx-X11/programs/Xserver/include/dixfontstr.h @@ -30,7 +30,7 @@ SOFTWARE. #include <X11/fonts/fontstruct.h> #include "closure.h" #define NEED_REPLIES -#include <X11/Xproto.h> /* for xQueryFontReply */ +#include <nx-X11/Xproto.h> /* for xQueryFontReply */ #define FONTCHARSET(font) (font) #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index 53c78d2de..e4b5e9fe8 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -31,7 +31,7 @@ SOFTWARE. #include "cursor.h" #include "gc.h" #include "pixmap.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> /* * direct-mapped hash table, used by resource manager to store diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h index 1c0c90d3e..1969e5cd7 100644 --- a/nx-X11/programs/Xserver/include/gc.h +++ b/nx-X11/programs/Xserver/include/gc.h @@ -50,15 +50,15 @@ SOFTWARE. #ifndef GC_H #define GC_H -#include <X11/X.h> /* for GContext, Mask */ +#include <nx-X11/X.h> /* for GContext, Mask */ #ifndef _XTYPEDEF_POINTER /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 #endif /* _XTYPEDEF_POINTER */ -#include <X11/Xdefs.h> /* for Bool */ +#include <nx-X11/Xdefs.h> /* for Bool */ -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "screenint.h" /* for ScreenPtr */ #include "pixmap.h" /* for DrawablePtr */ diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h index 16779f692..71d3ace47 100644 --- a/nx-X11/programs/Xserver/include/gcstruct.h +++ b/nx-X11/programs/Xserver/include/gcstruct.h @@ -58,7 +58,7 @@ SOFTWARE. #include "region.h" #include "pixmap.h" #include "screenint.h" -#include <X11/Xprotostr.h> +#include <nx-X11/Xprotostr.h> /* * functions which modify the state of the GC diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h index 88cc98050..a7c8d0dfe 100644 --- a/nx-X11/programs/Xserver/include/input.h +++ b/nx-X11/programs/Xserver/include/input.h @@ -52,8 +52,8 @@ SOFTWARE. #include "misc.h" #include "screenint.h" -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "window.h" /* for WindowPtr */ #define DEVICE_INIT 0 diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h index 1576f1433..cb3051c94 100644 --- a/nx-X11/programs/Xserver/include/misc.h +++ b/nx-X11/programs/Xserver/include/misc.h @@ -77,16 +77,16 @@ OF THIS SOFTWARE. extern unsigned long globalSerialNumber; extern unsigned long serverGeneration; -#include <X11/Xosdefs.h> -#include <X11/Xfuncproto.h> -#include <X11/Xmd.h> -#include <X11/X.h> +#include <nx-X11/Xosdefs.h> +#include <nx-X11/Xfuncproto.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/X.h> #ifndef _XTYPEDEF_POINTER /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 #endif /* _XTYPEDEF_POINTER */ -#include <X11/Xdefs.h> +#include <nx-X11/Xdefs.h> #ifndef IN_MODULE #ifndef NULL @@ -121,7 +121,7 @@ typedef struct _xReq *xReqPtr; #include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ #ifndef IN_MODULE -#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */ +#include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */ #endif #define NullBox ((BoxPtr)0) diff --git a/nx-X11/programs/Xserver/include/miscstruct.h b/nx-X11/programs/Xserver/include/miscstruct.h index 87874aae4..7df9240c9 100644 --- a/nx-X11/programs/Xserver/include/miscstruct.h +++ b/nx-X11/programs/Xserver/include/miscstruct.h @@ -51,7 +51,7 @@ SOFTWARE. #define MISCSTRUCT_H 1 #include "misc.h" -#include <X11/Xprotostr.h> +#include <nx-X11/Xprotostr.h> #include "gc.h" typedef xPoint DDXPointRec; diff --git a/nx-X11/programs/Xserver/include/opaque.h b/nx-X11/programs/Xserver/include/opaque.h index ca29afdc0..749b6f5b9 100644 --- a/nx-X11/programs/Xserver/include/opaque.h +++ b/nx-X11/programs/Xserver/include/opaque.h @@ -31,7 +31,7 @@ from The Open Group. #ifndef OPAQUE_H #define OPAQUE_H -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "globals.h" diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 551b35097..e150e1e0b 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -54,7 +54,7 @@ SOFTWARE. #include "misc.h" #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr)) -#include <X11/Xalloca.h> +#include <nx-X11/Xalloca.h> #ifndef IN_MODULE #include <stdarg.h> #else diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h index 297227493..0539ca516 100644 --- a/nx-X11/programs/Xserver/include/scrnintstr.h +++ b/nx-X11/programs/Xserver/include/scrnintstr.h @@ -56,7 +56,7 @@ SOFTWARE. #include "colormap.h" #include "cursor.h" #include "validate.h" -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "dix.h" typedef struct _PixmapFormat { diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h index cbfed645f..571115365 100644 --- a/nx-X11/programs/Xserver/include/window.h +++ b/nx-X11/programs/Xserver/include/window.h @@ -53,7 +53,7 @@ SOFTWARE. #include "misc.h" #include "region.h" #include "screenint.h" -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #define TOTALLY_OBSCURED 0 #define UNOBSCURED 1 diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h index dab6fcf71..5c181bc51 100644 --- a/nx-X11/programs/Xserver/include/windowstr.h +++ b/nx-X11/programs/Xserver/include/windowstr.h @@ -58,7 +58,7 @@ SOFTWARE. #include "resource.h" /* for ROOT_WINDOW_ID_BASE */ #include "dix.h" #include "miscstruct.h" -#include <X11/Xprotostr.h> +#include <nx-X11/Xprotostr.h> #include "opaque.h" #define GuaranteeNothing 0 diff --git a/nx-X11/programs/Xserver/mfb/maskbits.h b/nx-X11/programs/Xserver/mfb/maskbits.h index 7e2b74a18..94a7e8955 100644 --- a/nx-X11/programs/Xserver/mfb/maskbits.h +++ b/nx-X11/programs/Xserver/mfb/maskbits.h @@ -28,8 +28,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "servermd.h" diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h index 0f3f5778f..6eea34b6c 100644 --- a/nx-X11/programs/Xserver/mi/mi.h +++ b/nx-X11/programs/Xserver/mi/mi.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef MI_H #define MI_H -#include <X11/X.h> +#include <nx-X11/X.h> #include "region.h" #include "validate.h" #include "window.h" diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index f06c4b51d..8db188a6e 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -62,8 +62,8 @@ SOFTWARE. #include <math.h> #undef _XOPEN_SOURCE #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "misc.h" #include "gcstruct.h" #include "scrnintstr.h" @@ -72,7 +72,7 @@ SOFTWARE. #include "mifpoly.h" #include "mi.h" #include "mifillarc.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> static double miDsin(double a); static double miDcos(double a); diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c index 0caad083f..60318a046 100644 --- a/nx-X11/programs/Xserver/mi/mibitblt.c +++ b/nx-X11/programs/Xserver/mi/mibitblt.c @@ -52,8 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "misc.h" #include "gcstruct.h" @@ -62,7 +62,7 @@ SOFTWARE. #include "scrnintstr.h" #include "mi.h" #include "regionstr.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "servermd.h" #ifndef HAS_FFS diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c index f18648f66..875ec87f3 100644 --- a/nx-X11/programs/Xserver/mi/mibstore.c +++ b/nx-X11/programs/Xserver/mi/mibstore.c @@ -49,9 +49,9 @@ implied warranty. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c index 14ff0d69a..913b0e47a 100644 --- a/nx-X11/programs/Xserver/mi/miclipn.c +++ b/nx-X11/programs/Xserver/mi/miclipn.c @@ -32,7 +32,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "windowstr.h" #include "scrnintstr.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c index 98f3e521d..15d3f7f46 100644 --- a/nx-X11/programs/Xserver/mi/micmap.c +++ b/nx-X11/programs/Xserver/mi/micmap.c @@ -40,8 +40,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c index f3dae5768..782ddad49 100644 --- a/nx-X11/programs/Xserver/mi/miexpose.c +++ b/nx-X11/programs/Xserver/mi/miexpose.c @@ -80,10 +80,10 @@ Equipment Corporation. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_EVENTS -#include <X11/Xproto.h> -#include <X11/Xprotostr.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xprotostr.h> #include "misc.h" #include "regionstr.h" @@ -95,7 +95,7 @@ Equipment Corporation. #include "dixstruct.h" #include "mi.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "globals.h" diff --git a/nx-X11/programs/Xserver/mi/mifillarc.c b/nx-X11/programs/Xserver/mi/mifillarc.c index 0dcf25d05..533bfe996 100644 --- a/nx-X11/programs/Xserver/mi/mifillarc.c +++ b/nx-X11/programs/Xserver/mi/mifillarc.c @@ -34,8 +34,8 @@ Author: Bob Scheifler, MIT X Consortium #endif #include <math.h> -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mifillrct.c b/nx-X11/programs/Xserver/mi/mifillrct.c index 9f68db720..8a8f2b4f3 100644 --- a/nx-X11/programs/Xserver/mi/mifillrct.c +++ b/nx-X11/programs/Xserver/mi/mifillrct.c @@ -51,8 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mifpolycon.c b/nx-X11/programs/Xserver/mi/mifpolycon.c index 40b83586f..95b81bbb6 100644 --- a/nx-X11/programs/Xserver/mi/mifpolycon.c +++ b/nx-X11/programs/Xserver/mi/mifpolycon.c @@ -51,7 +51,7 @@ SOFTWARE. #endif #include <math.h> -#include <X11/X.h> +#include <nx-X11/X.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index b70a6a67e..f4ff4c243 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -191,35 +191,35 @@ typedef void (*InitExtension)(INITARGS); #ifdef MITSHM #define _XSHM_SERVER_ -#include <X11/extensions/shmstr.h> +#include <nx-X11/extensions/shmstr.h> #endif #ifdef XTEST #define _XTEST_SERVER_ -#include <X11/extensions/XTest.h> +#include <nx-X11/extensions/XTest.h> #endif #ifdef XKB -#include <X11/extensions/XKB.h> +#include <nx-X11/extensions/XKB.h> #endif #ifdef LBX #define _XLBX_SERVER_ -#include <X11/extensions/lbxstr.h> +#include <nx-X11/extensions/lbxstr.h> #endif #ifdef XAPPGROUP #define _XAG_SERVER_ -#include <X11/extensions/Xagstr.h> +#include <nx-X11/extensions/Xagstr.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/securstr.h> +#include <nx-X11/extensions/securstr.h> #endif #ifdef PANORAMIX -#include <X11/extensions/panoramiXproto.h> +#include <nx-X11/extensions/panoramiXproto.h> #endif #ifdef XF86BIGFONT -#include <X11/extensions/xf86bigfstr.h> +#include <nx-X11/extensions/xf86bigfstr.h> #endif #ifdef RES -#include <X11/extensions/XResproto.h> +#include <nx-X11/extensions/XResproto.h> #endif /* FIXME: this whole block of externs should be from the appropriate headers */ diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index 732e47af0..f67704e11 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -4,7 +4,7 @@ #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipoly.c b/nx-X11/programs/Xserver/mi/mipoly.c index 403d3da56..11214a732 100644 --- a/nx-X11/programs/Xserver/mi/mipoly.c +++ b/nx-X11/programs/Xserver/mi/mipoly.c @@ -60,7 +60,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipolygen.c b/nx-X11/programs/Xserver/mi/mipolygen.c index c3d9ef397..98fe21d50 100644 --- a/nx-X11/programs/Xserver/mi/mipolygen.c +++ b/nx-X11/programs/Xserver/mi/mipolygen.c @@ -50,7 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "gcstruct.h" #include "miscanfill.h" #include "mipoly.h" diff --git a/nx-X11/programs/Xserver/mi/mipolypnt.c b/nx-X11/programs/Xserver/mi/mipolypnt.c index 5d615c28d..dcbdf85d0 100644 --- a/nx-X11/programs/Xserver/mi/mipolypnt.c +++ b/nx-X11/programs/Xserver/mi/mipolypnt.c @@ -50,8 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipolyrect.c b/nx-X11/programs/Xserver/mi/mipolyrect.c index 98e467f9f..9b21bb032 100644 --- a/nx-X11/programs/Xserver/mi/mipolyrect.c +++ b/nx-X11/programs/Xserver/mi/mipolyrect.c @@ -50,8 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mipolyseg.c b/nx-X11/programs/Xserver/mi/mipolyseg.c index dcf3d815a..bd3c93ed6 100644 --- a/nx-X11/programs/Xserver/mi/mipolyseg.c +++ b/nx-X11/programs/Xserver/mi/mipolyseg.c @@ -50,8 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c index 5fce1cae7..44834db50 100644 --- a/nx-X11/programs/Xserver/mi/mipushpxl.c +++ b/nx-X11/programs/Xserver/mi/mipushpxl.c @@ -50,7 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/mi/miregion.c index 5ec4ec55a..1df0dcc46 100644 --- a/nx-X11/programs/Xserver/mi/miregion.c +++ b/nx-X11/programs/Xserver/mi/miregion.c @@ -82,7 +82,7 @@ Equipment Corporation. #endif #include "regionstr.h" -#include <X11/Xprotostr.h> +#include <nx-X11/Xprotostr.h> #include "gc.h" #include "mi.h" #include "mispans.h" diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index 78e2af5a4..4950eaa93 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -32,7 +32,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "servermd.h" #include "misc.h" #include "mi.h" @@ -42,7 +42,7 @@ from The Open Group. #include "miline.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <X11/extensions/XShm.h> +#include <nx-X11/extensions/XShm.h> #endif /* We use this structure to propogate some information from miScreenInit to diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index 44cf18f2e..fa9ef4591 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -47,7 +47,7 @@ from The Open Group. #include <math.h> #undef _XOPEN_SOURCE #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c index 179c6e31e..44b7ada60 100644 --- a/nx-X11/programs/Xserver/mi/miwindow.c +++ b/nx-X11/programs/Xserver/mi/miwindow.c @@ -50,7 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "regionstr.h" #include "region.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/mi/mizerarc.c b/nx-X11/programs/Xserver/mi/mizerarc.c index 62402f41b..4b4d724a6 100644 --- a/nx-X11/programs/Xserver/mi/mizerarc.c +++ b/nx-X11/programs/Xserver/mi/mizerarc.c @@ -40,8 +40,8 @@ Author: Bob Scheifler, MIT X Consortium #endif #include <math.h> -#include <X11/X.h> -#include <X11/Xprotostr.h> +#include <nx-X11/X.h> +#include <nx-X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mizerclip.c b/nx-X11/programs/Xserver/mi/mizerclip.c index e648b21d4..6acfc7fe0 100644 --- a/nx-X11/programs/Xserver/mi/mizerclip.c +++ b/nx-X11/programs/Xserver/mi/mizerclip.c @@ -49,7 +49,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/mi/mizerline.c b/nx-X11/programs/Xserver/mi/mizerline.c index 8e62a8c94..5a61ff5d6 100644 --- a/nx-X11/programs/Xserver/mi/mizerline.c +++ b/nx-X11/programs/Xserver/mi/mizerline.c @@ -50,7 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index d97d44ab6..0a18c28c8 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -78,19 +78,19 @@ SOFTWARE. #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif -#include <X11/Xos.h> /* for strings, fcntl, time */ +#include <nx-X11/Xos.h> /* for strings, fcntl, time */ #include <errno.h> #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #include "misc.h" #ifdef __UNIXOS2__ #define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) #endif #include "osdep.h" -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include "dixstruct.h" #include "opaque.h" #ifdef DPMSExtension @@ -138,7 +138,7 @@ mffs(fd_mask mask) #ifdef DPMSExtension #define DPMS_SERVER -#include <X11/extensions/dpms.h> +#include <nx-X11/extensions/dpms.h> #endif #ifdef XTESTEXT1 diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 07b460f40..05dfaf38a 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -62,15 +62,15 @@ SOFTWARE. #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif #include <stdio.h> #include <stdlib.h> -#include <X11/Xtrans/Xtrans.h> -#include <X11/Xauth.h> -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "site.h" #include <errno.h> @@ -197,14 +197,14 @@ SOFTWARE. #endif #define X_INCLUDE_NETDB_H -#include <X11/Xos_r.h> +#include <nx-X11/Xos_r.h> #include "dixstruct.h" #include "osdep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifndef PATH_MAX diff --git a/nx-X11/programs/Xserver/os/auth.c b/nx-X11/programs/Xserver/os/auth.c index dfb6f8899..c14c1e874 100644 --- a/nx-X11/programs/Xserver/os/auth.c +++ b/nx-X11/programs/Xserver/os/auth.c @@ -57,8 +57,8 @@ from The Open Group. #ifdef K5AUTH # include <krb5/krb5.h> #endif -# include <X11/X.h> -# include <X11/Xauth.h> +# include <nx-X11/X.h> +# include <nx-X11/Xauth.h> # include "misc.h" # include "osdep.h" # include "dixstruct.h" @@ -66,10 +66,10 @@ from The Open Group. # include <sys/stat.h> #ifdef XCSECURITY #define _SECURITY_SERVER -# include <X11/extensions/security.h> +# include <nx-X11/extensions/security.h> #endif #ifdef WIN32 -#include <X11/Xw32defs.h> +#include <nx-X11/Xw32defs.h> #endif struct protocol { diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 0f846d084..ef71cd540 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -68,14 +68,14 @@ SOFTWARE. #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/Xtrans/Xtrans.h> #include <errno.h> #include <signal.h> #include <stdio.h> @@ -144,15 +144,15 @@ extern __const__ int _nfiles; #endif /* WIN32 */ #include "misc.h" #include "osdep.h" -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include "opaque.h" #include "dixstruct.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include <nx-X11/extensions/Xagsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef LBX #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index b92e7c4ae..ccfc01dfe 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -63,11 +63,11 @@ SOFTWARE. #define DEBUG_COMMUNICATION #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif #include <stdio.h> -#include <X11/Xtrans/Xtrans.h> -#include <X11/Xmd.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/Xmd.h> #include <errno.h> #if !defined(__UNIXOS2__) && !defined(WIN32) #ifndef Lynx @@ -76,12 +76,12 @@ SOFTWARE. #include <uio.h> #endif #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "os.h" #include "osdep.h" -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include "opaque.h" #include "dixstruct.h" #include "misc.h" @@ -125,7 +125,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL; lswaps((req)->length) : (req)->length) #ifdef BIGREQS -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/extensions/bigreqstr.h> #define get_big_req_len(req,cli) ((cli)->swapped ? \ lswapl(((xBigReq *)(req))->length) : \ diff --git a/nx-X11/programs/Xserver/os/k5auth.c b/nx-X11/programs/Xserver/os/k5auth.c index 3c50de032..f2ed5369d 100644 --- a/nx-X11/programs/Xserver/os/k5auth.c +++ b/nx-X11/programs/Xserver/os/k5auth.c @@ -54,11 +54,11 @@ from The Open Group. #undef BITS32 #undef xfree #include <krb5/los-proto.h> -#include <X11/X.h> +#include <nx-X11/X.h> #include "os.h" #include "osdep.h" -#include <X11/Xproto.h> -#include <X11/Xfuncs.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xfuncs.h> #include "dixstruct.h" #include <com_err.h> #include "Xauth.h" diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 9af39800f..2444cd333 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -99,7 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <stdio.h> #include <time.h> #include <sys/stat.h> diff --git a/nx-X11/programs/Xserver/os/mitauth.c b/nx-X11/programs/Xserver/os/mitauth.c index 2f42fd41f..abf7976af 100644 --- a/nx-X11/programs/Xserver/os/mitauth.c +++ b/nx-X11/programs/Xserver/os/mitauth.c @@ -37,7 +37,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index e8c2d5959..e0c5de3a8 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -103,7 +103,7 @@ SOFTWARE. #endif #endif -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> /* * MAXSOCKS is used only for initialising MaxClients when no other method diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index ea99ace21..ca707d4b2 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -52,10 +52,10 @@ SOFTWARE. #endif #include <stdio.h> -#include <X11/X.h> +#include <nx-X11/X.h> #include "os.h" #include "osdep.h" -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #ifdef SMART_SCHEDULE #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c index 896291e59..94c26651b 100644 --- a/nx-X11/programs/Xserver/os/rpcauth.c +++ b/nx-X11/programs/Xserver/os/rpcauth.c @@ -40,7 +40,7 @@ from The Open Group. #ifdef SECURE_RPC -#include <X11/X.h> +#include <nx-X11/X.h> #include "Xauth.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/os/secauth.c b/nx-X11/programs/Xserver/os/secauth.c index 1000b4e79..eadb17b40 100644 --- a/nx-X11/programs/Xserver/os/secauth.c +++ b/nx-X11/programs/Xserver/os/secauth.c @@ -30,7 +30,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -38,7 +38,7 @@ from The Open Group. #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif static char InvalidPolicyReason[] = "invalid policy specification"; diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index b09190c4e..3ab08897a 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -79,13 +79,13 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #if defined(WIN32) && !defined(__CYGWIN__) -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <stdio.h> #include "misc.h" -#include <X11/X.h> -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/X.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "input.h" #include "dixfont.h" #include "osdep.h" @@ -136,11 +136,11 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XKB -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif #ifdef RENDER @@ -258,7 +258,7 @@ Bool noXvExtension = FALSE; #endif #define X_INCLUDE_NETDB_H -#include <X11/Xos_r.h> +#include <nx-X11/Xos_r.h> #include <errno.h> diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c index a2487d4bc..4d2d3f1ee 100644 --- a/nx-X11/programs/Xserver/os/xalloc.c +++ b/nx-X11/programs/Xserver/os/xalloc.c @@ -39,9 +39,9 @@ Pascal Haible. #include <stdlib.h> /* for malloc() etc. */ -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "misc.h" -#include <X11/X.h> +#include <nx-X11/X.h> #ifdef XALLOC_LOG #include <stdio.h> diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index e02ca349c..92fbde478 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -40,8 +40,8 @@ from The Open Group. #endif #include <stdio.h> -#include <X11/X.h> -#include <X11/Xtrans/Xtrans.h> +#include <nx-X11/X.h> +#include <nx-X11/Xtrans/Xtrans.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -51,7 +51,7 @@ from The Open Group. static Bool authFromXDMCP; #ifdef XDMCP -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #undef REQUEST #include <X11/Xdmcp.h> diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 675e9c456..4181e52ce 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -21,10 +21,10 @@ #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #if !defined(WIN32) #ifndef Lynx @@ -39,10 +39,10 @@ #include <stdio.h> #include <stdlib.h> -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "misc.h" -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include "osdep.h" #include "input.h" #include "dixstruct.h" @@ -76,7 +76,7 @@ #include <X11/Xdmcp.h> #define X_INCLUDE_NETDB_H -#include <X11/Xos_r.h> +#include <nx-X11/Xos_r.h> #ifdef NX_TRANS_SOCKET diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c index 54bbeefe2..4423208ff 100644 --- a/nx-X11/programs/Xserver/os/xprintf.c +++ b/nx-X11/programs/Xserver/os/xprintf.c @@ -30,7 +30,7 @@ #include <dix-config.h> #endif -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include "os.h" #include <stdarg.h> #include <stdio.h> diff --git a/nx-X11/programs/Xserver/randr/randrproto.h b/nx-X11/programs/Xserver/randr/randrproto.h index 7d5c139e9..bded957fa 100644 --- a/nx-X11/programs/Xserver/randr/randrproto.h +++ b/nx-X11/programs/Xserver/randr/randrproto.h @@ -30,7 +30,7 @@ #ifndef _XRANDRP_H_ #define _XRANDRP_H_ -/*#include <X11/extensions/randr.h>*/ +/*#include <nx-X11/extensions/randr.h>*/ #include "randr.h" #define Window CARD32 diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h index 3c3db2c13..bab784b8f 100644 --- a/nx-X11/programs/Xserver/randr/randrstr.h +++ b/nx-X11/programs/Xserver/randr/randrstr.h @@ -32,8 +32,8 @@ #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_ -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -44,17 +44,17 @@ #include "extnsionst.h" #include "servermd.h" #ifndef NXAGENT_SERVER -#include <X11/extensions/randr.h> -#include <X11/extensions/randrproto.h> +#include <nx-X11/extensions/randr.h> +#include <nx-X11/extensions/randrproto.h> #else #include "randr.h" #include "randrproto.h" #endif #ifdef RENDER -#include <X11/extensions/render.h> /* we share subpixel order information */ +#include <nx-X11/extensions/render.h> /* we share subpixel order information */ #include "picturestr.h" #endif -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> /* required for ABI compatibility for now */ #define RANDR_10_INTERFACE 1 diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c index 5441f8abc..2bc17cf21 100644 --- a/nx-X11/programs/Xserver/randr/rrxinerama.c +++ b/nx-X11/programs/Xserver/randr/rrxinerama.c @@ -88,7 +88,7 @@ #include "randrstr.h" #include "swaprep.h" #ifndef NXAGENT_SERVER -#include <X11/extensions/panoramiXproto.h> +#include <nx-X11/extensions/panoramiXproto.h> #else #include "panoramiXproto.h" #endif diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index aa1cd7543..2c5b867b4 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -43,7 +43,7 @@ and Jim Haggerty of Metheus. #include "dixstruct.h" #include "extnsionst.h" #define _XRECORD_SERVER_ -#include <X11/extensions/recordstr.h> +#include <nx-X11/extensions/recordstr.h> #include "set.h" #ifndef XFree86LOADER diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c index 15293af64..27e5ab949 100644 --- a/nx-X11/programs/Xserver/render/animcur.c +++ b/nx-X11/programs/Xserver/render/animcur.c @@ -36,8 +36,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/render/glyphstr.h b/nx-X11/programs/Xserver/render/glyphstr.h index e9bbd19b0..f27a73fbb 100644 --- a/nx-X11/programs/Xserver/render/glyphstr.h +++ b/nx-X11/programs/Xserver/render/glyphstr.h @@ -26,7 +26,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include <X11/extensions/renderproto.h> +#include <nx-X11/extensions/renderproto.h> #include "picture.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index 8d644b35e..2dedbc9c4 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -30,8 +30,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -42,11 +42,11 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include <X11/extensions/render.h> -#include <X11/extensions/renderproto.h> +#include <nx-X11/extensions/render.h> +#include <nx-X11/extensions/renderproto.h> #include "picturestr.h" #include "glyphstr.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h b/nx-X11/programs/Xserver/xfixes/xfixesint.h index 4892654be..a883acaec 100755 --- a/nx-X11/programs/Xserver/xfixes/xfixesint.h +++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h @@ -30,13 +30,13 @@ #define _XFIXESINT_H_ #define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include <X11/extensions/xfixesproto.h> +#include <nx-X11/extensions/xfixesproto.h> #include "windowstr.h" #include "selection.h" #include "xfixes.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c index 22d62a502..e99e4c2dd 100644 --- a/nx-X11/programs/Xserver/xkb/ddxBeep.c +++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #if (defined(__osf__) && defined(__alpha)) #include <sys/sysinfo.h> diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c index b023531dc..8ffd344ca 100644 --- a/nx-X11/programs/Xserver/xkb/ddxConfig.c +++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c @@ -32,16 +32,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #include "os.h" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBconfig.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBconfig.h> Bool XkbDDXApplyConfig(XPointer cfg_in,XkbSrvInfoPtr info) diff --git a/nx-X11/programs/Xserver/xkb/ddxCtrls.c b/nx-X11/programs/Xserver/xkb/ddxCtrls.c index 2e4e106ce..9fee8aa30 100644 --- a/nx-X11/programs/Xserver/xkb/ddxCtrls.c +++ b/nx-X11/programs/Xserver/xkb/ddxCtrls.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> void XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl) diff --git a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c index d0e37f263..04094e787 100644 --- a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c @@ -32,15 +32,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> extern int DeviceValuator; diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c index 73c8a2415..b77d040ff 100644 --- a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> void XkbDDXFakePointerButton(int event,int button) diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c index ffd6f5d79..33fa49ae7 100644 --- a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c @@ -33,14 +33,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #ifdef PANORAMIX #include "panoramiX.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxInit.c b/nx-X11/programs/Xserver/xkb/ddxInit.c index 8b76b7cb1..00ffea14e 100644 --- a/nx-X11/programs/Xserver/xkb/ddxInit.c +++ b/nx-X11/programs/Xserver/xkb/ddxInit.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> int XkbDDXInitDevice(DeviceIntPtr dev) diff --git a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c index c940e5321..e56377ca5 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c +++ b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> void XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic) diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c index b78dc420d..44fad85ca 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c @@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxLEDs.c b/nx-X11/programs/Xserver/xkb/ddxLEDs.c index fb5f72bf8..92ab12ee8 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLEDs.c +++ b/nx-X11/programs/Xserver/xkb/ddxLEDs.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> void XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new) diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c index 9c961e934..3dfb85644 100644 --- a/nx-X11/programs/Xserver/xkb/ddxList.c +++ b/nx-X11/programs/Xserver/xkb/ddxList.c @@ -33,17 +33,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <ctype.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xos.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include <X11/extensions/XKM.h> +#include <nx-X11/X.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/extensions/XKM.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #ifndef PATH_MAX #ifdef MAXPATHLEN diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 7caf9b1cb..16343fc9c 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -44,17 +44,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <unistd.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xos.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include <X11/extensions/XKM.h> +#include <nx-X11/X.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/extensions/XKM.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #include "xkb.h" #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) @@ -94,7 +94,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef WIN32 -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> const char* Win32TempDir() { diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c index 5c0bca4cd..c71216d70 100644 --- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c +++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c @@ -10,10 +10,10 @@ #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> +#include <nx-X11/X.h> #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxVT.c b/nx-X11/programs/Xserver/xkb/ddxVT.c index 1b7853fa0..1806ed257 100644 --- a/nx-X11/programs/Xserver/xkb/ddxVT.c +++ b/nx-X11/programs/Xserver/xkb/ddxVT.c @@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 441d88a5c..4a1561db3 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -31,18 +31,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #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" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #include "extnsionst.h" #include "xkb.h" -#include <X11/extensions/XI.h> +#include <nx-X11/extensions/XI.h> int XkbEventBase; int XkbErrorBase; @@ -3916,7 +3916,7 @@ ProcXkbSetNames(ClientPtr client) /***====================================================================***/ -#include <X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKBgeom.h> #define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index 75e46dc32..ac5713d05 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -36,11 +36,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <limits.h> #endif #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #if !defined(WIN32) && !defined(Lynx) #include <sys/time.h> #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c index b7f3e13a5..eb1c80448 100644 --- a/nx-X11/programs/Xserver/xkb/xkbActions.c +++ b/nx-X11/programs/Xserver/xkb/xkbActions.c @@ -34,12 +34,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #include "xkb.h" #include <ctype.h> diff --git a/nx-X11/programs/Xserver/xkb/xkbEvents.c b/nx-X11/programs/Xserver/xkb/xkbEvents.c index ca201c6f0..6c0aa0761 100644 --- a/nx-X11/programs/Xserver/xkb/xkbEvents.c +++ b/nx-X11/programs/Xserver/xkb/xkbEvents.c @@ -32,13 +32,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include <X11/extensions/XI.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/extensions/XI.h> #include "inputstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #include "xkb.h" /***====================================================================***/ diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index ef7e6a4f7..9afe0dacc 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -41,19 +41,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <unistd.h> #include <math.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include <X11/Xatom.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> +#include <nx-X11/Xatom.h> #include "misc.h" #include "inputstr.h" #include "opaque.h" #include "property.h" #define XKBSRV_NEED_FILE_FUNCS -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> -#include <X11/extensions/XKMformat.h> -#include <X11/extensions/XKBfile.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBgeom.h> +#include <nx-X11/extensions/XKMformat.h> +#include <nx-X11/extensions/XKBfile.h> #include "xkb.h" #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) diff --git a/nx-X11/programs/Xserver/xkb/xkbLEDs.c b/nx-X11/programs/Xserver/xkb/xkbLEDs.c index e04c05f14..20203ef2c 100644 --- a/nx-X11/programs/Xserver/xkb/xkbLEDs.c +++ b/nx-X11/programs/Xserver/xkb/xkbLEDs.c @@ -34,13 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <ctype.h> #include <math.h> #define NEED_EVENTS 1 -#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/XI.h> -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XKBsrv.h> #include "xkb.h" /***====================================================================***/ diff --git a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c index 713995d16..330fd2800 100644 --- a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c +++ b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c @@ -33,12 +33,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> #include <ctype.h> diff --git a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c index 82f476790..ac601c525 100644 --- a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c +++ b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c @@ -33,15 +33,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBsrv.h> -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <nx-X11/extensions/XI.h> +#include <nx-X11/extensions/XIproto.h> extern void ProcessOtherEvent( xEvent * /* xE */, diff --git a/nx-X11/programs/Xserver/xkb/xkbSwap.c b/nx-X11/programs/Xserver/xkb/xkbSwap.c index be1cd94fc..c16209153 100644 --- a/nx-X11/programs/Xserver/xkb/xkbSwap.c +++ b/nx-X11/programs/Xserver/xkb/xkbSwap.c @@ -31,14 +31,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #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/XKBstr.h> +#include <nx-X11/extensions/XKBsrv.h> +#include <nx-X11/extensions/XKBstr.h> #include "extnsionst.h" #include "xkb.h" diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index f3c3ff8ca..465644f16 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -34,16 +34,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <ctype.h> #include <math.h> #define NEED_EVENTS 1 -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #define XK_CYRILLIC -#include <X11/keysym.h> +#include <nx-X11/keysym.h> #include "misc.h" #include "inputstr.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> #include "xkb.h" #ifdef MODE_SWITCH |