Skip to content

N
nx-libs
Commit 433d8186 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).

In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process.
parent f58006d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 258 deletions
Makefile
View file @ 433d8186
...@@ -149,9 +149,9 @@ install-full: ...@@ -149,9 +149,9 @@ install-full:
. replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | \ . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | \
while read dirname; do \ while read dirname; do \
$(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"; \ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"; \
$(INSTALL_FILE) $${dirname}/*.h \ $(INSTALL_FILE) $${dirname}/*.h \
"$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"/ || true; \ "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"/ || true; \
done; \ done; \
# Provide means for Xinerama support in NX/X2Go sessions. This # Provide means for Xinerama support in NX/X2Go sessions. This
......
debian/libnx-x11-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_X11.so usr/lib/*/libNX_X11.so
usr/include/*/nx/X11/ImUtil.h usr/include/*/nx-X11/ImUtil.h
usr/include/*/nx/X11/XKBlib.h usr/include/*/nx-X11/XKBlib.h
usr/include/*/nx/X11/Xcms.h usr/include/*/nx-X11/Xcms.h
usr/include/*/nx/X11/Xlib.h usr/include/*/nx-X11/Xlib.h
usr/include/*/nx/X11/XlibConf.h usr/include/*/nx-X11/XlibConf.h
usr/include/*/nx/X11/Xlibint.h usr/include/*/nx-X11/Xlibint.h
usr/include/*/nx/X11/Xlocale.h usr/include/*/nx-X11/Xlocale.h
usr/include/*/nx/X11/Xregion.h usr/include/*/nx-X11/Xregion.h
usr/include/*/nx/X11/Xresource.h usr/include/*/nx-X11/Xresource.h
usr/include/*/nx/X11/Xutil.h usr/include/*/nx-X11/Xutil.h
usr/include/*/nx/X11/cursorfont.h usr/include/*/nx-X11/cursorfont.h
usr/include/*/nx/X11/misc.h usr/include/*/nx-X11/misc.h
usr/include/*/nx/X11/os.h usr/include/*/nx-X11/os.h
usr/include/*/nx/X11/X10.h usr/include/*/nx-X11/X10.h
debian/libnx-xau-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xau.so usr/lib/*/libNX_Xau.so
usr/include/*/nx/X11/Xauth.h usr/include/*/nx-X11/Xauth.h
debian/libnx-xcomposite-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xcomposite.so usr/lib/*/libNX_Xcomposite.so
usr/include/*/nx/X11/extensions/Xcomposite.h usr/include/*/nx-X11/extensions/Xcomposite.h
debian/libnx-xext-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xext.so usr/lib/*/libNX_Xext.so
usr/include/*/nx/X11/extensions/MITMisc.h usr/include/*/nx-X11/extensions/MITMisc.h
usr/include/*/nx/X11/extensions/XEVI.h usr/include/*/nx-X11/extensions/XEVI.h
usr/include/*/nx/X11/extensions/XEVIstr.h usr/include/*/nx-X11/extensions/XEVIstr.h
usr/include/*/nx/X11/extensions/Xevie.h usr/include/*/nx-X11/extensions/Xevie.h
usr/include/*/nx/X11/extensions/Xeviestr.h usr/include/*/nx-X11/extensions/Xeviestr.h
usr/include/*/nx/X11/extensions/XLbx.h usr/include/*/nx-X11/extensions/XLbx.h
usr/include/*/nx/X11/extensions/XShm.h usr/include/*/nx-X11/extensions/XShm.h
usr/include/*/nx/X11/extensions/Xag.h usr/include/*/nx-X11/extensions/Xag.h
usr/include/*/nx/X11/extensions/Xagsrv.h usr/include/*/nx-X11/extensions/Xagsrv.h
usr/include/*/nx/X11/extensions/Xagstr.h usr/include/*/nx-X11/extensions/Xagstr.h
usr/include/*/nx/X11/extensions/Xcup.h usr/include/*/nx-X11/extensions/Xcup.h
usr/include/*/nx/X11/extensions/Xcupstr.h usr/include/*/nx-X11/extensions/Xcupstr.h
usr/include/*/nx/X11/extensions/Xdbe.h usr/include/*/nx-X11/extensions/Xdbe.h
usr/include/*/nx/X11/extensions/Xdbeproto.h usr/include/*/nx-X11/extensions/Xdbeproto.h
usr/include/*/nx/X11/extensions/Xext.h usr/include/*/nx-X11/extensions/Xext.h
usr/include/*/nx/X11/extensions/dpms.h usr/include/*/nx-X11/extensions/dpms.h
usr/include/*/nx/X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/dpmsstr.h
usr/include/*/nx/X11/extensions/extutil.h usr/include/*/nx-X11/extensions/extutil.h
usr/include/*/nx/X11/extensions/lbxstr.h usr/include/*/nx-X11/extensions/lbxstr.h
usr/include/*/nx/X11/extensions/lbxbuf.h usr/include/*/nx-X11/extensions/lbxbuf.h
usr/include/*/nx/X11/extensions/lbxdeltastr.h usr/include/*/nx-X11/extensions/lbxdeltastr.h
usr/include/*/nx/X11/extensions/lbximage.h usr/include/*/nx-X11/extensions/lbximage.h
usr/include/*/nx/X11/extensions/lbxbufstr.h usr/include/*/nx-X11/extensions/lbxbufstr.h
usr/include/*/nx/X11/extensions/lbxopts.h usr/include/*/nx-X11/extensions/lbxopts.h
usr/include/*/nx/X11/extensions/lbxzlib.h usr/include/*/nx-X11/extensions/lbxzlib.h
usr/include/*/nx/X11/extensions/mitmiscstr.h usr/include/*/nx-X11/extensions/mitmiscstr.h
usr/include/*/nx/X11/extensions/multibuf.h usr/include/*/nx-X11/extensions/multibuf.h
usr/include/*/nx/X11/extensions/multibufst.h usr/include/*/nx-X11/extensions/multibufst.h
usr/include/*/nx/X11/extensions/security.h usr/include/*/nx-X11/extensions/security.h
usr/include/*/nx/X11/extensions/securstr.h usr/include/*/nx-X11/extensions/securstr.h
usr/include/*/nx/X11/extensions/shape.h usr/include/*/nx-X11/extensions/shape.h
usr/include/*/nx/X11/extensions/sync.h usr/include/*/nx-X11/extensions/sync.h
usr/include/*/nx/X11/extensions/xtestext1.h usr/include/*/nx-X11/extensions/xtestext1.h
debian/libnx-xfixes-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xfixes.so usr/lib/*/libNX_Xfixes.so
usr/include/*/nx/X11/extensions/Xfixes.h usr/include/*/nx-X11/extensions/Xfixes.h
debian/libnx-xinerama-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xinerama.so usr/lib/*/libNX_Xinerama.so
usr/include/*/nx/X11/extensions/Xinerama.h usr/include/*/nx-X11/extensions/Xinerama.h
usr/include/*/nx/X11/extensions/panoramiXext.h usr/include/*/nx-X11/extensions/panoramiXext.h
debian/libnx-xrender-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xrender.so usr/lib/*/libNX_Xrender.so
usr/include/*/nx/X11/extensions/Xrender.h usr/include/*/nx-X11/extensions/Xrender.h
debian/libnx-xtst-dev.install.in
View file @ 433d8186
usr/lib/*/libNX_Xtst.so usr/lib/*/libNX_Xtst.so
usr/include/*/nx/X11/extensions/XTest.h usr/include/*/nx-X11/extensions/XTest.h
debian/nx-x11proto-composite-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/extensions/composite.h usr/include/*/nx-X11/extensions/composite.h
usr/include/*/nx/X11/extensions/compositeproto.h usr/include/*/nx-X11/extensions/compositeproto.h
\ No newline at end of file \ No newline at end of file
debian/nx-x11proto-core-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/DECkeysym.h usr/include/*/nx-X11/DECkeysym.h
usr/include/*/nx/X11/HPkeysym.h usr/include/*/nx-X11/HPkeysym.h
usr/include/*/nx/X11/Sunkeysym.h usr/include/*/nx-X11/Sunkeysym.h
usr/include/*/nx/X11/X.h usr/include/*/nx-X11/X.h
usr/include/*/nx/X11/XF86keysym.h usr/include/*/nx-X11/XF86keysym.h
usr/include/*/nx/X11/XWDFile.h usr/include/*/nx-X11/XWDFile.h
usr/include/*/nx/X11/Xalloca.h usr/include/*/nx-X11/Xalloca.h
usr/include/*/nx/X11/Xarch.h usr/include/*/nx-X11/Xarch.h
usr/include/*/nx/X11/Xatom.h usr/include/*/nx-X11/Xatom.h
usr/include/*/nx/X11/Xdefs.h usr/include/*/nx-X11/Xdefs.h
usr/include/*/nx/X11/Xfuncproto.h usr/include/*/nx-X11/Xfuncproto.h
usr/include/*/nx/X11/Xfuncs.h usr/include/*/nx-X11/Xfuncs.h
usr/include/*/nx/X11/Xmd.h usr/include/*/nx-X11/Xmd.h
usr/include/*/nx/X11/Xos.h usr/include/*/nx-X11/Xos.h
usr/include/*/nx/X11/Xos_r.h usr/include/*/nx-X11/Xos_r.h
usr/include/*/nx/X11/Xosdefs.h usr/include/*/nx-X11/Xosdefs.h
usr/include/*/nx/X11/Xpoll.h usr/include/*/nx-X11/Xpoll.h
usr/include/*/nx/X11/Xproto.h usr/include/*/nx-X11/Xproto.h
usr/include/*/nx/X11/Xprotostr.h usr/include/*/nx-X11/Xprotostr.h
usr/include/*/nx/X11/Xthreads.h usr/include/*/nx-X11/Xthreads.h
usr/include/*/nx/X11/ap_keysym.h usr/include/*/nx-X11/ap_keysym.h
usr/include/*/nx/X11/keysym.h usr/include/*/nx-X11/keysym.h
usr/include/*/nx/X11/keysymdef.h usr/include/*/nx-X11/keysymdef.h
debian/nx-x11proto-render-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/extensions/render.h usr/include/*/nx-X11/extensions/render.h
usr/include/*/nx/X11/extensions/renderproto.h usr/include/*/nx-X11/extensions/renderproto.h
debian/nx-x11proto-xext-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xteststr.h
usr/include/*/nx/X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shapestr.h
usr/include/*/nx/X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/shmstr.h
usr/include/*/nx/X11/extensions/syncstr.h usr/include/*/nx-X11/extensions/syncstr.h
debian/nx-x11proto-xfixes-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/extensions/xfixeswire.h usr/include/*/nx-X11/extensions/xfixeswire.h
usr/include/*/nx/X11/extensions/xfixesproto.h usr/include/*/nx-X11/extensions/xfixesproto.h
debian/nx-x11proto-xinerama-dev.install.in
View file @ 433d8186
usr/include/*/nx/X11/extensions/panoramiXproto.h usr/include/*/nx-X11/extensions/panoramiXproto.h
\ No newline at end of file \ No newline at end of file
debian/rules
View file @ 433d8186
...@@ -42,28 +42,28 @@ override_dh_install: ...@@ -42,28 +42,28 @@ override_dh_install:
rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a
# remove extras, GL, and other unneeded headers # remove extras, GL, and other unneeded headers
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86misc.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dgastr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/
dh_install --fail-missing dh_install --fail-missing
......
nx-X11/config/cf/X11.tmpl
View file @ 433d8186
...@@ -1223,7 +1223,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules ...@@ -1223,7 +1223,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
PROGRAMSRC = $(TOP)/programs PROGRAMSRC = $(TOP)/programs
LIBSRC = $(XTOP)/lib LIBSRC = $(XTOP)/lib
INCLUDESRC = BuildIncDir INCLUDESRC = BuildIncDir
XINCLUDESRC = $(INCLUDESRC)/X11 XINCLUDESRC = $(INCLUDESRC)/nx-X11
SERVERSRC = $(XTOP)/programs/Xserver SERVERSRC = $(XTOP)/programs/Xserver
CONTRIBSRC = ContribDir CONTRIBSRC = ContribDir
UNSUPPORTEDSRC = UnsupportedDir UNSUPPORTEDSRC = UnsupportedDir
......
nx-X11/include/GL/glx.h
View file @ 433d8186
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
** compliant with the OpenGL(R) version 1.2.1 Specification. ** compliant with the OpenGL(R) version 1.2.1 Specification.
*/ */
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <X11/Xutil.h> #include <nx-X11/Xutil.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glxtokens.h> #include <GL/glxtokens.h>
......
nx-X11/include/GL/glxint.h
View file @ 433d8186
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
** $SGI$ ** $SGI$
*/ */
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/Xdefs.h> #include <nx-X11/Xdefs.h>
#include "GL/gl.h" #include "GL/gl.h"
typedef struct __GLXvisualConfigRec __GLXvisualConfig; typedef struct __GLXvisualConfigRec __GLXvisualConfig;
......
nx-X11/include/Imakefile
View file @ 433d8186
...@@ -51,10 +51,10 @@ HEADERS = \ ...@@ -51,10 +51,10 @@ HEADERS = \
all:: all::
BuildIncludes($(HEADERS),X11,..) BuildIncludes($(HEADERS),nx-X11,..)
#if BuildLibraries #if BuildLibraries
InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
#endif #endif
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS))
......
nx-X11/include/XWDFile.h
View file @ 433d8186
...@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef XWDFILE_H #ifndef XWDFILE_H
#define XWDFILE_H #define XWDFILE_H
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#define XWD_FILE_VERSION 7 #define XWD_FILE_VERSION 7
#define sz_XWDheader 100 #define sz_XWDheader 100
......
nx-X11/include/Xdefs.h
View file @ 433d8186
...@@ -31,7 +31,7 @@ authorization from The XFree86 Project Inc.. ...@@ -31,7 +31,7 @@ authorization from The XFree86 Project Inc..
#define _XDEFS_H #define _XDEFS_H
#ifdef _XSERVER64 #ifdef _XSERVER64
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#endif #endif
#ifndef _XTYPEDEF_ATOM #ifndef _XTYPEDEF_ATOM
......
nx-X11/include/Xfuncs.h
View file @ 433d8186
...@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XFUNCS_H_ #ifndef _XFUNCS_H_
#define _XFUNCS_H_ #define _XFUNCS_H_
#include <X11/Xosdefs.h> #include <nx-X11/Xosdefs.h>
/* the old Xfuncs.h, for pre-R6 */ /* the old Xfuncs.h, for pre-R6 */
#if !(defined(XFree86LOADER) && defined(IN_MODULE)) #if !(defined(XFree86LOADER) && defined(IN_MODULE))
......
nx-X11/include/Xos.h
View file @ 433d8186
...@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XOS_H_ #ifndef _XOS_H_
#define _XOS_H_ #define _XOS_H_
#include <X11/Xosdefs.h> #include <nx-X11/Xosdefs.h>
/* /*
* Get major data types (esp. caddr_t) * Get major data types (esp. caddr_t)
...@@ -150,7 +150,7 @@ extern int sys_nerr; ...@@ -150,7 +150,7 @@ extern int sys_nerr;
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32
#include <X11/Xw32defs.h> #include <nx-X11/Xw32defs.h>
#else #else
#include <sys/file.h> #include <sys/file.h>
#endif #endif
...@@ -285,6 +285,6 @@ struct sockaddr_un { ...@@ -285,6 +285,6 @@ struct sockaddr_un {
}; };
#endif #endif
#include <X11/Xarch.h> #include <nx-X11/Xarch.h>
#endif /* _XOS_H_ */ #endif /* _XOS_H_ */
nx-X11/include/Xos_r.h
View file @ 433d8186
...@@ -216,7 +216,7 @@ extern void XtProcessUnlock( ...@@ -216,7 +216,7 @@ extern void XtProcessUnlock(
* *
* #define X_INCLUDE_PWD_H * #define X_INCLUDE_PWD_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xgetpwparams; * typedef ... _Xgetpwparams;
* *
...@@ -394,7 +394,7 @@ typedef int _Xgetpwret; ...@@ -394,7 +394,7 @@ typedef int _Xgetpwret;
* *
* #define X_INCLUDE_NETDB_H * #define X_INCLUDE_NETDB_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xgethostbynameparams; * typedef ... _Xgethostbynameparams;
* typedef ... _Xgetservbynameparams; * typedef ... _Xgetservbynameparams;
...@@ -556,7 +556,7 @@ typedef int _Xgetservbynameparams; /* dummy */ ...@@ -556,7 +556,7 @@ typedef int _Xgetservbynameparams; /* dummy */
* *
* #define X_INCLUDE_DIRENT_H * #define X_INCLUDE_DIRENT_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xreaddirparams; * typedef ... _Xreaddirparams;
* *
...@@ -680,7 +680,7 @@ extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **); ...@@ -680,7 +680,7 @@ extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **);
* *
* #define X_INCLUDE_UNISTD_H * #define X_INCLUDE_UNISTD_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xgetloginparams; * typedef ... _Xgetloginparams;
* typedef ... _Xttynameparams; * typedef ... _Xttynameparams;
...@@ -822,7 +822,7 @@ typedef struct { ...@@ -822,7 +822,7 @@ typedef struct {
* *
* #define X_INCLUDE_STRING_H * #define X_INCLUDE_STRING_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xstrtokparams; * typedef ... _Xstrtokparams;
* *
...@@ -868,7 +868,7 @@ typedef char * _Xstrtokparams; ...@@ -868,7 +868,7 @@ typedef char * _Xstrtokparams;
* *
* #define X_INCLUDE_TIME_H * #define X_INCLUDE_TIME_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xatimeparams; * typedef ... _Xatimeparams;
* typedef ... _Xctimeparams; * typedef ... _Xctimeparams;
...@@ -1036,7 +1036,7 @@ typedef struct tm _Xltimeparams; ...@@ -1036,7 +1036,7 @@ typedef struct tm _Xltimeparams;
* *
* #define X_INCLUDE_GRP_H * #define X_INCLUDE_GRP_H
* #define XOS_USE_..._LOCKING * #define XOS_USE_..._LOCKING
* #include <X11/Xos_r.h> * #include <nx-X11/Xos_r.h>
* *
* typedef ... _Xgetgrparams; * typedef ... _Xgetgrparams;
* *
......
nx-X11/include/Xpoll.h.in
View file @ 433d8186
...@@ -75,7 +75,7 @@ from The Open Group. ...@@ -75,7 +75,7 @@ from The Open Group.
#ifndef USE_POLL #ifndef USE_POLL
#include <X11/Xos.h> #include <nx-X11/Xos.h>
/* Below is the monster branch from hell. Basically, most systems will drop to /* Below is the monster branch from hell. Basically, most systems will drop to
* 'the branch below is the fallthrough for halfway modern systems', and include * 'the branch below is the fallthrough for halfway modern systems', and include
...@@ -104,7 +104,7 @@ from The Open Group. ...@@ -104,7 +104,7 @@ from The Open Group.
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#ifdef CSRG_BASED #ifdef CSRG_BASED
#include <sys/param.h> #include <sys/param.h>
...@@ -241,7 +241,7 @@ extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, ...@@ -241,7 +241,7 @@ extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
#ifndef FD_SETSIZE #ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE #define FD_SETSIZE XFD_SETSIZE
#endif #endif
#include <X11/Xwinsock.h> #include <nx-X11/Xwinsock.h>
#define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) #define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
......
nx-X11/include/Xproto.h
View file @ 433d8186
...@@ -73,8 +73,8 @@ SOFTWARE. ...@@ -73,8 +73,8 @@ SOFTWARE.
******************************************************************/ ******************************************************************/
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#include <X11/Xprotostr.h> #include <nx-X11/Xprotostr.h>
/* /*
* Define constants for the sizes of the network packets. The sz_ prefix is * Define constants for the sizes of the network packets. The sz_ prefix is
......
nx-X11/include/Xprotostr.h
View file @ 433d8186
...@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ...@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE. SOFTWARE.
******************************************************************/ ******************************************************************/
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
/* Used by PolySegment */ /* Used by PolySegment */
......
nx-X11/include/Xthreads.h
View file @ 433d8186
...@@ -98,7 +98,7 @@ extern xthread_t (*_x11_thr_self)(); ...@@ -98,7 +98,7 @@ extern xthread_t (*_x11_thr_self)();
#define xcondition_broadcast(cv) cond_broadcast(cv) #define xcondition_broadcast(cv) cond_broadcast(cv)
#else /* !SVR4 */ #else /* !SVR4 */
#ifdef WIN32 #ifdef WIN32
#include <X11/Xwindows.h> #include <nx-X11/Xwindows.h>
typedef DWORD xthread_t; typedef DWORD xthread_t;
typedef DWORD xthread_key_t; typedef DWORD xthread_key_t;
struct _xthread_waiter { struct _xthread_waiter {
......
nx-X11/include/extensions/Imakefile
View file @ 433d8186
...@@ -101,10 +101,10 @@ HEADERS = Xext.h \ ...@@ -101,10 +101,10 @@ HEADERS = Xext.h \
all:: all::
BuildIncludes($(HEADERS),X11/extensions,../..) BuildIncludes($(HEADERS),nx-X11/extensions,../..)
#if BuildLibraries #if BuildLibraries
InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS)) InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11/extensions,$(INSTINCFLAGS))
#endif #endif
InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions) InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions)
......
nx-X11/include/extensions/MITMisc.h
View file @ 433d8186
...@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XMITMISC_H_ #ifndef _XMITMISC_H_
#define _XMITMISC_H_ #define _XMITMISC_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_MITSetBugMode 0 #define X_MITSetBugMode 0
#define X_MITGetBugMode 1 #define X_MITGetBugMode 1
......
nx-X11/include/extensions/XEVI.h
View file @ 433d8186
...@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _XEVI_H_ #ifndef _XEVI_H_
#define _XEVI_H_ #define _XEVI_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_EVIQueryVersion 0 #define X_EVIQueryVersion 0
#define X_EVIGetVisualInfo 1 #define X_EVIGetVisualInfo 1
#define XEVI_TRANSPARENCY_NONE 0 #define XEVI_TRANSPARENCY_NONE 0
......
nx-X11/include/extensions/XEVIstr.h
View file @ 433d8186
...@@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _EVISTR_H_ #ifndef _EVISTR_H_
#define _EVISTR_H_ #define _EVISTR_H_
#include <X11/extensions/XEVI.h> #include <nx-X11/extensions/XEVI.h>
#define VisualID CARD32 #define VisualID CARD32
#define EVINAME "Extended-Visual-Information" #define EVINAME "Extended-Visual-Information"
......
nx-X11/include/extensions/XInput.h
View file @ 433d8186
...@@ -52,8 +52,8 @@ SOFTWARE. ...@@ -52,8 +52,8 @@ SOFTWARE.
#ifndef _XINPUT_H_ #ifndef _XINPUT_H_
#define _XINPUT_H_ #define _XINPUT_H_
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <X11/extensions/XI.h> #include <nx-X11/extensions/XI.h>
#define _deviceKeyPress 0 #define _deviceKeyPress 0
#define _deviceKeyRelease 1 #define _deviceKeyRelease 1
......
nx-X11/include/extensions/XIproto.h
View file @ 433d8186
...@@ -50,8 +50,8 @@ SOFTWARE. ...@@ -50,8 +50,8 @@ SOFTWARE.
#ifndef _XIPROTO_H #ifndef _XIPROTO_H
#define _XIPROTO_H #define _XIPROTO_H
#include <X11/Xproto.h> #include <nx-X11/Xproto.h>
#include <X11/X.h> #include <nx-X11/X.h>
/* make sure types have right sizes for protocol structures. */ /* make sure types have right sizes for protocol structures. */
#define Window CARD32 #define Window CARD32
......
nx-X11/include/extensions/XKBgeom.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _XKBGEOM_H_ #ifndef _XKBGEOM_H_
#define _XKBGEOM_H_ #define _XKBGEOM_H_
#include <X11/extensions/XKBstr.h> #include <nx-X11/extensions/XKBstr.h>
#ifdef XKB_IN_SERVER #ifdef XKB_IN_SERVER
#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias #define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
......
nx-X11/include/extensions/XKBproto.h
View file @ 433d8186
...@@ -28,8 +28,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -28,8 +28,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _XKBPROTO_H_ #ifndef _XKBPROTO_H_
#define _XKBPROTO_H_ #define _XKBPROTO_H_
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#include <X11/extensions/XKB.h> #include <nx-X11/extensions/XKB.h>
#define Window CARD32 #define Window CARD32
#define Atom CARD32 #define Atom CARD32
......
nx-X11/include/extensions/XKBsrv.h
View file @ 433d8186
...@@ -69,8 +69,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -69,8 +69,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods #define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods
#endif #endif
#include <X11/extensions/XKBstr.h> #include <nx-X11/extensions/XKBstr.h>
#include <X11/extensions/XKBproto.h> #include <nx-X11/extensions/XKBproto.h>
#include "inputstr.h" #include "inputstr.h"
#ifdef NXAGENT_SERVER #ifdef NXAGENT_SERVER
...@@ -1100,9 +1100,9 @@ extern void XkbSendNewKeyboardNotify( ...@@ -1100,9 +1100,9 @@ extern void XkbSendNewKeyboardNotify(
#ifdef XKBSRV_NEED_FILE_FUNCS #ifdef XKBSRV_NEED_FILE_FUNCS
#include <X11/extensions/XKMformat.h> #include <nx-X11/extensions/XKMformat.h>
#include <X11/extensions/XKBfile.h> #include <nx-X11/extensions/XKBfile.h>
#include <X11/extensions/XKBrules.h> #include <nx-X11/extensions/XKBrules.h>
#define _XkbListKeymaps 0 #define _XkbListKeymaps 0
#define _XkbListKeycodes 1 #define _XkbListKeycodes 1
......
nx-X11/include/extensions/XKBstr.h
View file @ 433d8186
...@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _XKBSTR_H_ #ifndef _XKBSTR_H_
#define _XKBSTR_H_ #define _XKBSTR_H_
#include <X11/extensions/XKB.h> #include <nx-X11/extensions/XKB.h>
#define XkbCharToInt(v) ((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f)) #define XkbCharToInt(v) ((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f))
#define XkbIntTo2Chars(i,h,l) (((h)=((i>>8)&0xff)),((l)=((i)&0xff))) #define XkbIntTo2Chars(i,h,l) (((h)=((i>>8)&0xff)),((l)=((i)&0xff)))
......
nx-X11/include/extensions/XLbx.h
View file @ 433d8186
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef _XLBX_H_ #ifndef _XLBX_H_
#define _XLBX_H_ #define _XLBX_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
/* /*
* NOTE: any changes or additions to the opcodes needs to be reflected * NOTE: any changes or additions to the opcodes needs to be reflected
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
#ifndef _XLBX_SERVER_ #ifndef _XLBX_SERVER_
#include <X11/Xdefs.h> #include <nx-X11/Xdefs.h>
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/XShm.h
View file @ 433d8186
...@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XSHM_H_ #ifndef _XSHM_H_
#define _XSHM_H_ #define _XSHM_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_ShmQueryVersion 0 #define X_ShmQueryVersion 0
#define X_ShmAttach 1 #define X_ShmAttach 1
......
nx-X11/include/extensions/XTest.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XTEST_H_ #ifndef _XTEST_H_
#define _XTEST_H_ #define _XTEST_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XTestGetVersion 0 #define X_XTestGetVersion 0
#define X_XTestCompareCursor 1 #define X_XTestCompareCursor 1
...@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XTEST_SERVER_ #ifndef _XTEST_SERVER_
#include <X11/extensions/XInput.h> #include <nx-X11/extensions/XInput.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/Xag.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ from The Open Group. ...@@ -29,7 +29,7 @@ from The Open Group.
#ifndef _XAG_H_ #ifndef _XAG_H_
#define _XAG_H_ #define _XAG_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XagQueryVersion 0 #define X_XagQueryVersion 0
#define X_XagCreate 1 #define X_XagCreate 1
......
nx-X11/include/extensions/Xagsrv.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ from The Open Group. ...@@ -29,7 +29,7 @@ from The Open Group.
#ifndef _XAGSRV_H_ #ifndef _XAGSRV_H_
#define _XAGSRV_H_ #define _XAGSRV_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/Xagstr.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ from The Open Group. ...@@ -29,7 +29,7 @@ from The Open Group.
#ifndef _XAGSTR_H_ /* { */ #ifndef _XAGSTR_H_ /* { */
#define _XAGSTR_H_ #define _XAGSTR_H_
#include <X11/extensions/Xag.h> #include <nx-X11/extensions/Xag.h>
#define XAppGroup CARD32 #define XAppGroup CARD32
......
nx-X11/include/extensions/Xcup.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XCUP_H_ #ifndef _XCUP_H_
#define _XCUP_H_ #define _XCUP_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XcupQueryVersion 0 #define X_XcupQueryVersion 0
#define X_XcupGetReservedColormapEntries 1 #define X_XcupGetReservedColormapEntries 1
......
nx-X11/include/extensions/Xcupstr.h
View file @ 433d8186
...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XCUPSTR_H_ /* { */ #ifndef _XCUPSTR_H_ /* { */
#define _XCUPSTR_H_ #define _XCUPSTR_H_
#include <X11/extensions/Xcup.h> #include <nx-X11/extensions/Xcup.h>
#define XCUPNAME "TOG-CUP" #define XCUPNAME "TOG-CUP"
......
nx-X11/include/extensions/Xdbe.h
View file @ 433d8186
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
/* INCLUDES */ /* INCLUDES */
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/extensions/Xdbeproto.h> #include <nx-X11/extensions/Xdbeproto.h>
/* DEFINES */ /* DEFINES */
......
nx-X11/include/extensions/Xevie.h
View file @ 433d8186
...@@ -35,7 +35,7 @@ of the copyright holder. ...@@ -35,7 +35,7 @@ of the copyright holder.
#ifndef _XEVIE_H_ #ifndef _XEVIE_H_
#define _XEVIE_H_ #define _XEVIE_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define XEVIE_UNMODIFIED 0 #define XEVIE_UNMODIFIED 0
#define XEVIE_MODIFIED 1 #define XEVIE_MODIFIED 1
......
nx-X11/include/extensions/Xext.h
View file @ 433d8186
...@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _XEXT_H_ #ifndef _XEXT_H_
#define _XEXT_H_ #define _XEXT_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/Xinerama.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _Xinerama_h #ifndef _Xinerama_h
#define _Xinerama_h #define _Xinerama_h
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
typedef struct { typedef struct {
int screen_number; int screen_number;
......
nx-X11/include/extensions/Xv.h
View file @ 433d8186
...@@ -44,7 +44,7 @@ SOFTWARE. ...@@ -44,7 +44,7 @@ SOFTWARE.
** **
*/ */
#include <X11/X.h> #include <nx-X11/X.h>
#define XvName "XVideo" #define XvName "XVideo"
#define XvVersion 2 #define XvVersion 2
......
nx-X11/include/extensions/XvMC.h
View file @ 433d8186
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#ifndef _XVMC_H_ #ifndef _XVMC_H_
#define _XVMC_H_ #define _XVMC_H_
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/extensions/Xv.h> #include <nx-X11/extensions/Xv.h>
#define XvMCName "XVideo-MotionCompensation" #define XvMCName "XVideo-MotionCompensation"
#define XvMCNumEvents 0 #define XvMCNumEvents 0
......
nx-X11/include/extensions/XvMClib.h
View file @ 433d8186
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
#ifndef _XVMCLIB_H_ #ifndef _XVMCLIB_H_
#define _XVMCLIB_H_ #define _XVMCLIB_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/extensions/Xvlib.h> #include <nx-X11/extensions/Xvlib.h>
#include <X11/extensions/XvMC.h> #include <nx-X11/extensions/XvMC.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/Xvlib.h
View file @ 433d8186
...@@ -53,8 +53,8 @@ SOFTWARE. ...@@ -53,8 +53,8 @@ SOFTWARE.
** **
*/ */
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/extensions/Xv.h> #include <nx-X11/extensions/Xv.h>
typedef struct { typedef struct {
int numerator; int numerator;
......
nx-X11/include/extensions/Xvproto.h
View file @ 433d8186
...@@ -49,7 +49,7 @@ SOFTWARE. ...@@ -49,7 +49,7 @@ SOFTWARE.
** **
*/ */
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
/* Symbols: These are undefined at the end of this file to restore the /* Symbols: These are undefined at the end of this file to restore the
values they have in Xv.h */ values they have in Xv.h */
......
nx-X11/include/extensions/composite.h
View file @ 433d8186
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef _COMPOSITE_H_ #ifndef _COMPOSITE_H_
#define _COMPOSITE_H_ #define _COMPOSITE_H_
#include <X11/extensions/xfixeswire.h> #include <nx-X11/extensions/xfixeswire.h>
#define COMPOSITE_NAME "Composite" #define COMPOSITE_NAME "Composite"
#define COMPOSITE_MAJOR 0 #define COMPOSITE_MAJOR 0
......
nx-X11/include/extensions/compositeproto.h
View file @ 433d8186
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#ifndef _COMPOSITEPROTO_H_ #ifndef _COMPOSITEPROTO_H_
#define _COMPOSITEPROTO_H_ #define _COMPOSITEPROTO_H_
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#include <X11/extensions/composite.h> #include <nx-X11/extensions/composite.h>
#define Window CARD32 #define Window CARD32
#define Region CARD32 #define Region CARD32
......
nx-X11/include/extensions/dpms.h
View file @ 433d8186
...@@ -46,8 +46,8 @@ Equipment Corporation. ...@@ -46,8 +46,8 @@ Equipment Corporation.
#ifndef DPMS_SERVER #ifndef DPMS_SERVER
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/extutil.h
View file @ 433d8186
...@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _EXTUTIL_H_ #ifndef _EXTUTIL_H_
#define _EXTUTIL_H_ #define _EXTUTIL_H_
#include <X11/extensions/Xext.h> #include <nx-X11/extensions/Xext.h>
/* /*
* We need to keep a list of open displays since the Xlib display list isn't * We need to keep a list of open displays since the Xlib display list isn't
......
nx-X11/include/extensions/fontcache.h
View file @ 433d8186
...@@ -68,7 +68,7 @@ typedef struct { ...@@ -68,7 +68,7 @@ typedef struct {
#ifndef _FONTCACHE_SERVER_ #ifndef _FONTCACHE_SERVER_
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/fontcacheP.h
View file @ 433d8186
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef _FONTCACHEP_H_ #ifndef _FONTCACHEP_H_
#define _FONTCACHEP_H_ #define _FONTCACHEP_H_
#include <X11/extensions/fontcache.h> #include <nx-X11/extensions/fontcache.h>
int FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */); int FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */);
void FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */); void FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */);
......
nx-X11/include/extensions/fontcachstr.h
View file @ 433d8186
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef _FONTCACHESTR_H_ #ifndef _FONTCACHESTR_H_
#define _FONTCACHESTR_H_ #define _FONTCACHESTR_H_
#include <X11/extensions/fontcache.h> #include <nx-X11/extensions/fontcache.h>
#define FONTCACHENAME "FontCache" #define FONTCACHENAME "FontCache"
......
nx-X11/include/extensions/lbxbuf.h
View file @ 433d8186
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
typedef struct _zlibbuffer *ZlibBufferPtr; typedef struct _zlibbuffer *ZlibBufferPtr;
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/lbxbufstr.h
View file @ 433d8186
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef _BUFFERSTR_H_ #ifndef _BUFFERSTR_H_
#define _BUFFERSTR_H_ #define _BUFFERSTR_H_
#include <X11/extensions/lbxbuf.h> #include <nx-X11/extensions/lbxbuf.h>
/* /*
* ZLIB Input/Output buffer * ZLIB Input/Output buffer
......
nx-X11/include/extensions/lbximage.h
View file @ 433d8186
...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _LBX_IMAGE_H_ #ifndef _LBX_IMAGE_H_
#define _LBX_IMAGE_H_ #define _LBX_IMAGE_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/lbxstr.h
View file @ 433d8186
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef _LBXSTR_H_ #ifndef _LBXSTR_H_
#define _LBXSTR_H_ #define _LBXSTR_H_
#include <X11/extensions/XLbx.h> #include <nx-X11/extensions/XLbx.h>
#define LBXNAME "LBX" #define LBXNAME "LBX"
......
nx-X11/include/extensions/multibuf.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _MULTIBUF_H_ #ifndef _MULTIBUF_H_
#define _MULTIBUF_H_ #define _MULTIBUF_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering" #define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering"
......
nx-X11/include/extensions/recordstr.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; ...@@ -29,7 +29,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44";
#ifndef _RECORDSTR_H_ #ifndef _RECORDSTR_H_
#define _RECORDSTR_H_ #define _RECORDSTR_H_
#include <X11/extensions/record.h> #include <nx-X11/extensions/record.h>
#define RECORD_NAME "RECORD" #define RECORD_NAME "RECORD"
#define RECORD_MAJOR_VERSION 1 #define RECORD_MAJOR_VERSION 1
......
nx-X11/include/extensions/renderproto.h
View file @ 433d8186
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#ifndef _XRENDERP_H_ #ifndef _XRENDERP_H_
#define _XRENDERP_H_ #define _XRENDERP_H_
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#include <X11/extensions/render.h> #include <nx-X11/extensions/render.h>
#define Window CARD32 #define Window CARD32
#define Drawable CARD32 #define Drawable CARD32
......
nx-X11/include/extensions/saverproto.h
View file @ 433d8186
...@@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. ...@@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium.
#ifndef _SAVERPROTO_H_ #ifndef _SAVERPROTO_H_
#define _SAVERPROTO_H_ #define _SAVERPROTO_H_
#include <X11/extensions/saver.h> #include <nx-X11/extensions/saver.h>
#define Window CARD32 #define Window CARD32
#define Drawable CARD32 #define Drawable CARD32
......
nx-X11/include/extensions/scrnsaver.h
View file @ 433d8186
...@@ -31,9 +31,9 @@ in this Software without prior written authorization from the X Consortium. ...@@ -31,9 +31,9 @@ in this Software without prior written authorization from the X Consortium.
#ifndef _SCRNSAVER_H_ #ifndef _SCRNSAVER_H_
#define _SCRNSAVER_H_ #define _SCRNSAVER_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <X11/extensions/saver.h> #include <nx-X11/extensions/saver.h>
typedef struct { typedef struct {
int type; /* of event */ int type; /* of event */
......
nx-X11/include/extensions/security.h
View file @ 433d8186
...@@ -30,7 +30,7 @@ from The Open Group. ...@@ -30,7 +30,7 @@ from The Open Group.
#define _SECURITY_H #define _SECURITY_H
#define _XAUTH_STRUCT_ONLY #define _XAUTH_STRUCT_ONLY
#include <X11/Xauth.h> #include <nx-X11/Xauth.h>
/* constants that server, library, and application all need */ /* constants that server, library, and application all need */
......
nx-X11/include/extensions/securstr.h
View file @ 433d8186
...@@ -29,7 +29,7 @@ from The Open Group. ...@@ -29,7 +29,7 @@ from The Open Group.
#ifndef _SECURSTR_H #ifndef _SECURSTR_H
#define _SECURSTR_H #define _SECURSTR_H
#include <X11/extensions/security.h> #include <nx-X11/extensions/security.h>
#define SECURITY_EXTENSION_NAME "SECURITY" #define SECURITY_EXTENSION_NAME "SECURITY"
#define SECURITY_MAJOR_VERSION 1 #define SECURITY_MAJOR_VERSION 1
......
nx-X11/include/extensions/shape.h
View file @ 433d8186
...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _SHAPE_H_ #ifndef _SHAPE_H_
#define _SHAPE_H_ #define _SHAPE_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_ShapeQueryVersion 0 #define X_ShapeQueryVersion 0
#define X_ShapeRectangles 1 #define X_ShapeRectangles 1
...@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _SHAPE_SERVER_ #ifndef _SHAPE_SERVER_
#include <X11/Xutil.h> #include <nx-X11/Xutil.h>
typedef struct { typedef struct {
int type; /* of event */ int type; /* of event */
......
nx-X11/include/extensions/sync.h
View file @ 433d8186
...@@ -53,7 +53,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -53,7 +53,7 @@ PERFORMANCE OF THIS SOFTWARE.
#ifndef _SYNC_H_ #ifndef _SYNC_H_
#define _SYNC_H_ #define _SYNC_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
......
nx-X11/include/extensions/vldXvMC.h
View file @ 433d8186
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#ifndef _VLDXVMC_H #ifndef _VLDXVMC_H
#define _VLDXVMC_H #define _VLDXVMC_H
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <X11/extensions/XvMC.h> #include <nx-X11/extensions/XvMC.h>
#include <X11/extensions/XvMClib.h> #include <nx-X11/extensions/XvMClib.h>
/* /*
* New "Motion compensation type". * New "Motion compensation type".
......
nx-X11/include/extensions/xf86bigfont.h
View file @ 433d8186
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _XF86BIGFONT_H_ #ifndef _XF86BIGFONT_H_
#define _XF86BIGFONT_H_ #define _XF86BIGFONT_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XF86BigfontQueryVersion 0 #define X_XF86BigfontQueryVersion 0
#define X_XF86BigfontQueryFont 1 #define X_XF86BigfontQueryFont 1
......
nx-X11/include/extensions/xf86bigfstr.h
View file @ 433d8186
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _XF86BIGFSTR_H_ #ifndef _XF86BIGFSTR_H_
#define _XF86BIGFSTR_H_ #define _XF86BIGFSTR_H_
#include <X11/extensions/xf86bigfont.h> #include <nx-X11/extensions/xf86bigfont.h>
#define XF86BIGFONTNAME "XFree86-Bigfont" #define XF86BIGFONTNAME "XFree86-Bigfont"
......
nx-X11/include/extensions/xf86dga.h
View file @ 433d8186
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#ifndef _XF86DGA_H_ #ifndef _XF86DGA_H_
#define _XF86DGA_H_ #define _XF86DGA_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/extensions/xf86dga1.h> #include <nx-X11/extensions/xf86dga1.h>
#define X_XDGAQueryVersion 0 #define X_XDGAQueryVersion 0
......
nx-X11/include/extensions/xf86dga1.h
View file @ 433d8186
...@@ -15,7 +15,7 @@ Copyright (c) 1995 XFree86 Inc ...@@ -15,7 +15,7 @@ Copyright (c) 1995 XFree86 Inc
#ifndef _XF86DGA1_H_ #ifndef _XF86DGA1_H_
#define _XF86DGA1_H_ #define _XF86DGA1_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XF86DGAQueryVersion 0 #define X_XF86DGAQueryVersion 0
#define X_XF86DGAGetVideoLL 1 #define X_XF86DGAGetVideoLL 1
......
nx-X11/include/extensions/xf86dgastr.h
View file @ 433d8186
...@@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc. ...@@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc.
#ifndef _XF86DGASTR_H_ #ifndef _XF86DGASTR_H_
#define _XF86DGASTR_H_ #define _XF86DGASTR_H_
#include <X11/extensions/xf86dga1str.h> #include <nx-X11/extensions/xf86dga1str.h>
#define XF86DGANAME "XFree86-DGA" #define XF86DGANAME "XFree86-DGA"
......
nx-X11/include/extensions/xf86misc.h
View file @ 433d8186
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef _XF86MISC_H_ #ifndef _XF86MISC_H_
#define _XF86MISC_H_ #define _XF86MISC_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XF86MiscQueryVersion 0 #define X_XF86MiscQueryVersion 0
#ifdef _XF86MISC_SAVER_COMPAT_ #ifdef _XF86MISC_SAVER_COMPAT_
......
nx-X11/include/extensions/xf86mscstr.h
View file @ 433d8186
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef _XF86MISCSTR_H_ #ifndef _XF86MISCSTR_H_
#define _XF86MISCSTR_H_ #define _XF86MISCSTR_H_
#include <X11/extensions/xf86misc.h> #include <nx-X11/extensions/xf86misc.h>
#define XF86MISCNAME "XFree86-Misc" #define XF86MISCNAME "XFree86-Misc"
......
nx-X11/include/extensions/xf86vmode.h
View file @ 433d8186
...@@ -35,8 +35,8 @@ from Kaleb S. KEITHLEY ...@@ -35,8 +35,8 @@ from Kaleb S. KEITHLEY
#ifndef _XF86VIDMODE_H_ #ifndef _XF86VIDMODE_H_
#define _XF86VIDMODE_H_ #define _XF86VIDMODE_H_
#include <X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#define X_XF86VidModeQueryVersion 0 #define X_XF86VidModeQueryVersion 0
#define X_XF86VidModeGetModeLine 1 #define X_XF86VidModeGetModeLine 1
......
nx-X11/include/extensions/xf86vmstr.h
View file @ 433d8186
...@@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY ...@@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY
#ifndef _XF86VIDMODESTR_H_ #ifndef _XF86VIDMODESTR_H_
#define _XF86VIDMODESTR_H_ #define _XF86VIDMODESTR_H_
#include <X11/extensions/xf86vmode.h> #include <nx-X11/extensions/xf86vmode.h>
#define XF86VIDMODENAME "XFree86-VidModeExtension" #define XF86VIDMODENAME "XFree86-VidModeExtension"
......
nx-X11/include/extensions/xfixesproto.h
View file @ 433d8186
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#ifndef _XFIXESPROTO_H_ #ifndef _XFIXESPROTO_H_
#define _XFIXESPROTO_H_ #define _XFIXESPROTO_H_
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#include <X11/extensions/xfixeswire.h> #include <nx-X11/extensions/xfixeswire.h>
#define _SHAPE_SERVER_ #define _SHAPE_SERVER_
#include <X11/extensions/shape.h> #include <nx-X11/extensions/shape.h>
#undef _SHAPE_SERVER_ #undef _SHAPE_SERVER_
#define Window CARD32 #define Window CARD32
......
nx-X11/include/extensions/xtrapddmi.h
View file @ 433d8186
...@@ -42,8 +42,8 @@ SOFTWARE. ...@@ -42,8 +42,8 @@ SOFTWARE.
* contained herein should *not* be visible to clients (xtrapdi.h * contained herein should *not* be visible to clients (xtrapdi.h
* is used for this). The name is historical. * is used for this). The name is historical.
*/ */
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/extensions/xtrapbits.h> #include <nx-X11/extensions/xtrapbits.h>
#include "dix.h" #include "dix.h"
#ifndef MIN #ifndef MIN
......
nx-X11/include/extensions/xtrapdi.h
View file @ 433d8186
...@@ -48,14 +48,14 @@ SOFTWARE. ...@@ -48,14 +48,14 @@ SOFTWARE.
#ifndef IN_MODULE #ifndef IN_MODULE
#include <stdio.h> #include <stdio.h>
#endif #endif
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/Xmd.h> #include <nx-X11/Xmd.h>
#ifdef SMT #ifdef SMT
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#endif #endif
#include <X11/Xproto.h> #include <nx-X11/Xproto.h>
#include <X11/extensions/xtrapbits.h> #include <nx-X11/extensions/xtrapbits.h>
#define XTrapExtName "DEC-XTRAP" #define XTrapExtName "DEC-XTRAP"
/* Current Release, Version, and Revision of the XTrap Extension */ /* Current Release, Version, and Revision of the XTrap Extension */
#define XETrapRelease 3L #define XETrapRelease 3L
......
nx-X11/include/extensions/xtrapemacros.h
View file @ 433d8186
...@@ -43,7 +43,7 @@ SOFTWARE. ...@@ -43,7 +43,7 @@ SOFTWARE.
* specified; however, use of Trap Context convenience * specified; however, use of Trap Context convenience
* routines is strongly encouraged (XETrapContext.c) * routines is strongly encouraged (XETrapContext.c)
*/ */
#include <X11/extensions/xtrapbits.h> #include <nx-X11/extensions/xtrapbits.h>
#include <signal.h> #include <signal.h>
/* msleep macro to replace msleep() for portability reasons */ /* msleep macro to replace msleep() for portability reasons */
......
nx-X11/include/extensions/xtraplib.h
View file @ 433d8186
...@@ -47,10 +47,10 @@ SOFTWARE. ...@@ -47,10 +47,10 @@ SOFTWARE.
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#endif #endif
#include <X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <X11/Intrinsic.h> #include <nx-X11/Intrinsic.h>
#include <X11/extensions/xtrapdi.h> #include <nx-X11/extensions/xtrapdi.h>
#include <X11/extensions/xtrapemacros.h> #include <nx-X11/extensions/xtrapemacros.h>
typedef struct /* Callback structure */ typedef struct /* Callback structure */
{ {
......
nx-X11/include/keysym.h
View file @ 433d8186
...@@ -71,5 +71,5 @@ SOFTWARE. ...@@ -71,5 +71,5 @@ SOFTWARE.
#define XK_CURRENCY #define XK_CURRENCY
#define XK_MATHEMATICAL #define XK_MATHEMATICAL
#include <X11/keysymdef.h> #include <nx-X11/keysymdef.h>
nx-X11/lib/X11/ClDisplay.c
View file @ 433d8186
...@@ -32,7 +32,7 @@ from The Open Group. ...@@ -32,7 +32,7 @@ from The Open Group.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <X11/Xtrans/Xtrans.h> #include <nx-X11/Xtrans/Xtrans.h>
#include "Xlib.h" #include "Xlib.h"
#include "Xlibint.h" #include "Xlibint.h"
#include "Xintconn.h" #include "Xintconn.h"
......
nx-X11/lib/X11/ConnDis.c
View file @ 433d8186
...@@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group. ...@@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <X11/Xlibint.h> #include <nx-X11/Xlibint.h>
#include <X11/Xtrans/Xtrans.h> #include <nx-X11/Xtrans/Xtrans.h>
#include <X11/Xauth.h> #include <nx-X11/Xauth.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
...@@ -68,7 +68,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -68,7 +68,7 @@ in this Software without prior written authorization from The Open Group.
#include <socket.h> #include <socket.h>
#endif #endif
#else #else
#include <X11/Xwindows.h> #include <nx-X11/Xwindows.h>
#endif #endif
#ifndef X_CONNECTION_RETRIES /* number retries on ECONNREFUSED */ #ifndef X_CONNECTION_RETRIES /* number retries on ECONNREFUSED */
......
nx-X11/lib/X11/ErrDes.c
View file @ 433d8186
...@@ -55,7 +55,7 @@ SOFTWARE. ...@@ -55,7 +55,7 @@ SOFTWARE.
#include <config.h> #include <config.h>
#endif #endif
#include "Xlibint.h" #include "Xlibint.h"
#include <X11/Xos.h> #include <nx-X11/Xos.h>
#include "Xresource.h" #include "Xresource.h"
#include <stdio.h> #include <stdio.h>
......
nx-X11/lib/X11/FSWrap.c
View file @ 433d8186
...@@ -64,7 +64,7 @@ from The Open Group. ...@@ -64,7 +64,7 @@ from The Open Group.
#include "Xlibint.h" #include "Xlibint.h"
#include "Xlcint.h" #include "Xlcint.h"
#include <ctype.h> #include <ctype.h>
#include <X11/Xos.h> #include <nx-X11/Xos.h>
#define XMAXLIST 256 #define XMAXLIST 256
......
nx-X11/lib/X11/FetchName.c
View file @ 433d8186
...@@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. ...@@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <X11/Xlibint.h> #include <nx-X11/Xlibint.h>
#include <X11/Xatom.h> #include <nx-X11/Xatom.h>
#include <X11/Xos.h> #include <nx-X11/Xos.h>
#include <stdio.h> #include <stdio.h>
......
nx-X11/lib/X11/Font.c
View file @ 433d8186
...@@ -47,7 +47,7 @@ authorization from the X Consortium and the XFree86 Project. ...@@ -47,7 +47,7 @@ authorization from the X Consortium and the XFree86 Project.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <X11/extensions/xf86bigfstr.h> #include <nx-X11/extensions/xf86bigfstr.h>
#endif #endif
#include "Xlcint.h" #include "Xlcint.h"
......
nx-X11/lib/X11/GetDflt.c
View file @ 433d8186
...@@ -52,8 +52,8 @@ SOFTWARE. ...@@ -52,8 +52,8 @@ SOFTWARE.
#include <config.h> #include <config.h>
#endif #endif
#include "Xlibint.h" #include "Xlibint.h"
#include <X11/Xos.h> #include <nx-X11/Xos.h>
#include <X11/Xresource.h> #include <nx-X11/Xresource.h>
#ifndef X_NOT_POSIX #ifndef X_NOT_POSIX
#ifdef _POSIX_SOURCE #ifdef _POSIX_SOURCE
...@@ -80,12 +80,12 @@ SOFTWARE. ...@@ -80,12 +80,12 @@ SOFTWARE.
#endif #endif
#ifdef XTHREADS #ifdef XTHREADS
#include <X11/Xthreads.h> #include <nx-X11/Xthreads.h>
#endif #endif
#ifndef WIN32 #ifndef WIN32
#define X_INCLUDE_PWD_H #define X_INCLUDE_PWD_H
#define XOS_USE_XLIB_LOCKING #define XOS_USE_XLIB_LOCKING
#include <X11/Xos_r.h> #include <nx-X11/Xos_r.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
......
nx-X11/lib/X11/GetHints.c
View file @ 433d8186
...@@ -51,11 +51,11 @@ SOFTWARE. ...@@ -51,11 +51,11 @@ SOFTWARE.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <X11/Xlibint.h> #include <nx-X11/Xlibint.h>
#include <X11/Xos.h> #include <nx-X11/Xos.h>
#include <X11/Xutil.h> #include <nx-X11/Xutil.h>
#include "Xatomtype.h" #include "Xatomtype.h"
#include <X11/Xatom.h> #include <nx-X11/Xatom.h>
#include <stdio.h> #include <stdio.h>
Status XGetSizeHints (dpy, w, hints, property) Status XGetSizeHints (dpy, w, hints, property)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment