aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/os')
-rw-r--r--nx-X11/programs/Xserver/os/WaitFor.c10
-rw-r--r--nx-X11/programs/Xserver/os/access.c14
-rw-r--r--nx-X11/programs/Xserver/os/auth.c8
-rw-r--r--nx-X11/programs/Xserver/os/connection.c14
-rw-r--r--nx-X11/programs/Xserver/os/io.c14
-rw-r--r--nx-X11/programs/Xserver/os/k5auth.c6
-rw-r--r--nx-X11/programs/Xserver/os/log.c2
-rw-r--r--nx-X11/programs/Xserver/os/mitauth.c2
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h2
-rw-r--r--nx-X11/programs/Xserver/os/osinit.c4
-rw-r--r--nx-X11/programs/Xserver/os/rpcauth.c2
-rw-r--r--nx-X11/programs/Xserver/os/secauth.c4
-rw-r--r--nx-X11/programs/Xserver/os/utils.c14
-rw-r--r--nx-X11/programs/Xserver/os/xalloc.c4
-rw-r--r--nx-X11/programs/Xserver/os/xdmauth.c6
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c12
-rw-r--r--nx-X11/programs/Xserver/os/xprintf.c2
17 files changed, 60 insertions, 60 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:58:09 +0000