Change all misc.h and os.h references to <X11/foo.h>.

16 files changed, 23 insertions, 23 deletions

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 545e1be21..18eacbdba 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -63,7 +63,7 @@ SOFTWARE.
 #include <errno.h>
 #include <stdio.h>
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 
 #ifdef __UNIXOS2__
 #define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
diff --git a/os/access.c b/os/access.c
index 1b3d96778..baad02fda 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,5 +1,5 @@
 /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.7 2004/11/15 15:06:50 ago Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.9 2005/05/02 22:01:08 harold Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -67,7 +67,7 @@ SOFTWARE.
 #include <X11/Xauth.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "site.h"
 #include <errno.h>
 #include <sys/types.h>
diff --git a/os/connection.c b/os/connection.c
index d8c07077b..45063c8a6 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -135,7 +135,7 @@ extern __const__ int _nfiles;
 #endif
 #endif
 #endif /* WIN32 */
-#include "misc.h"		/* for typedef of pointer */
+#include <X11/misc.h>		/* for typedef of pointer */
 #include "osdep.h"
 #include <X11/Xpoll.h>
 #include "opaque.h"
diff --git a/os/io.c b/os/io.c
index 5fa95962f..4e9f696c6 100644
--- a/os/io.c
+++ b/os/io.c
@@ -75,12 +75,12 @@ SOFTWARE.
 #include <X11/X.h>
 #define NEED_REPLIES
 #include <X11/Xproto.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include <X11/Xpoll.h>
 #include "opaque.h"
 #include "dixstruct.h"
-#include "misc.h"
+#include <X11/misc.h>
 #ifdef LBX
 #include "colormapst.h"
 #include "propertyst.h"
diff --git a/os/k5auth.c b/os/k5auth.c
index 876e04222..ebf16c9eb 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -51,7 +51,7 @@ from The Open Group.
 #undef xfree
 #include <krb5/los-proto.h>
 #include <X11/X.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include <X11/Xproto.h>
 #include <X11/Xfuncs.h>
diff --git a/os/lbxio.c b/os/lbxio.c
index c44389010..21724b58c 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -63,12 +63,12 @@ SOFTWARE.
 #endif
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "os.h"
+#include <X11/os.h>
 #include <X11/Xpoll.h>
 #include "osdep.h"
 #include "opaque.h"
 #include "dixstruct.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "colormapst.h"
 #include "propertyst.h"
 #include "lbxserve.h"
diff --git a/os/mitauth.c b/os/mitauth.c
index 6ad0c3467..dfaea35ab 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -34,7 +34,7 @@ from The Open Group.
  */
 
 #include <X11/X.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include "dixstruct.h"
 
diff --git a/os/oscolor.c b/os/oscolor.c
index 557d539bb..bb927c4b6 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -59,7 +59,7 @@ SOFTWARE.
 #endif
 #endif
 #include "rgb.h"
-#include "os.h"
+#include <X11/os.h>
 #include "opaque.h"
 
 /* Note that we are assuming there is only one database for all the screens. */
@@ -148,7 +148,7 @@ OsLookupColor(int screen, char *name, unsigned int len,
  */
 
 #include <stdio.h>
-#include "os.h"
+#include <X11/os.h>
 #include "opaque.h"
 
 #define HASHSIZE 511
diff --git a/os/osinit.c b/os/osinit.c
index 76938ce43..03a017b85 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -49,7 +49,7 @@ SOFTWARE.
 
 #include <stdio.h>
 #include <X11/X.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include <X11/Xos.h>
 
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 6b0cf816c..037a4facf 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -38,8 +38,8 @@ from The Open Group.
 
 #include <X11/X.h>
 #include "Xauth.h"
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 
 #include <rpc/rpc.h>
diff --git a/os/secauth.c b/os/secauth.c
index 4daeba1a5..553f50a3a 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -27,7 +27,7 @@ from The Open Group.
 /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
 
 #include <X11/X.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include "dixstruct.h"
 #include "swaprep.h"
diff --git a/os/utils.c b/os/utils.c
index 5242960f3..a94c29481 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.12 2005/03/23 19:58:45 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.17 2005/06/09 02:29:42 ajax Exp $ */
 /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
 /*
 
@@ -62,7 +62,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include <X11/Xos.h>
 #include <stdio.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include <X11/X.h>
 #include <X11/Xtrans/Xtrans.h>
 #include "input.h"
diff --git a/os/xalloc.c b/os/xalloc.c
index ad606b2a2..f257cf41c 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -36,7 +36,7 @@ Pascal Haible.
 #include <stdlib.h>	/* for malloc() etc. */
 
 #include <X11/Xos.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include <X11/X.h>
 
 #ifdef XALLOC_LOG
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 1468dfeb7..9c8bc2cdb 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -38,7 +38,7 @@ from The Open Group.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xtrans/Xtrans.h>
-#include "os.h"
+#include <X11/os.h>
 #include "osdep.h"
 #include "dixstruct.h"
 
diff --git a/os/xdmcp.c b/os/xdmcp.c
index f253c2495..f90536b5f 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.5 2005/04/20 12:25:47 daniels Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.7 2005/05/02 21:57:32 harold Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include <X11/Xpoll.h>
 #include "osdep.h"
 #include "input.h"
diff --git a/os/xprintf.c b/os/xprintf.c
index cb9f1460a..70051f26f 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -27,7 +27,7 @@
  * use or other dealings in this Software without prior written authorization.
  */
 #include <X11/Xos.h>
-#include "os.h"
+#include <X11/os.h>
 #include <stdarg.h>
 #include <stdio.h>