Commit 0bb66963 authored by Daniel Stone's avatar Daniel Stone

Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".

parent 401e4580
......@@ -65,7 +65,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "input.h" /* Server DevicePtr definitions */
#include <X11/misc.h> /* Server swapping macros */
#include "misc.h" /* Server swapping macros */
#include "dixstruct.h" /* Server ClientRec definitions */
#include "resource.h" /* Used with the MakeAtom call */
#ifdef PC
......
......@@ -56,7 +56,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xprotostr.h>
#include <X11/extensions/xtrapdi.h>
#include "input.h" /* Server DevicePtr definitions */
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#ifdef PC
# include "extnsist.h"
......
......@@ -46,7 +46,7 @@ SOFTWARE.
#include <X11/Xprotostr.h>
#include <X11/extensions/xtrapdi.h>
#include "input.h" /* Server DevicePtr definitions */
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#ifdef PC
# include "extnsist.h"
......
......@@ -34,7 +34,7 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "scrnintstr.h"
......
......@@ -35,8 +35,8 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include <X11/extensions/bigreqstr.h>
......
......@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "colormapst.h"
......
......@@ -41,8 +41,8 @@ Equipment Corporation.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "opaque.h"
......
......@@ -39,7 +39,7 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "scrnintstr.h"
......
......@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "window.h"
#include <X11/os.h>
#include "os.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -35,8 +35,8 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#define _MITMISC_SERVER_
......
......@@ -34,7 +34,7 @@ Equipment Corporation.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xarch.h>
#include <X11/misc.h>
#include "misc.h"
#include "cursor.h"
#include "cursorstr.h"
#include "extnsionst.h"
......
......@@ -32,7 +32,7 @@ Equipment Corporation.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "cursor.h"
#include "cursorstr.h"
#include "extnsionst.h"
......
......@@ -45,7 +45,7 @@ Equipment Corporation.
#include "opaque.h"
#include "inputstr.h"
#include "migc.h"
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "panoramiX.h"
#include "panoramiXsrv.h"
......
......@@ -38,8 +38,8 @@ in this Software without prior written authorization from the X Consortium.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -35,8 +35,8 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -49,8 +49,8 @@ in this Software without prior written authorization from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "resource.h"
#include "scrnintstr.h"
......
......@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
#include "sleepuntil.h"
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/misc.h>
#include "misc.h"
#include "windowstr.h"
#include "dixstruct.h"
#include "pixmapstr.h"
......
......@@ -61,8 +61,8 @@ PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xmd.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
......
......@@ -36,8 +36,8 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
......
......@@ -40,7 +40,7 @@ of the copyright holder.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "colormapst.h"
......
......@@ -66,8 +66,8 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "gcstruct.h"
#include "dixfontstr.h"
......
......@@ -76,7 +76,7 @@ copyright holders.
#define NEED_EVENTS
#include <X11/Xproto.h>
#undef NEED_EVENTS
#include <X11/misc.h>
#include "misc.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -12,8 +12,8 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
......
......@@ -36,8 +36,8 @@ from The Open Group.
#include <X11/X.h>
#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "windowstr.h"
......
......@@ -70,7 +70,7 @@ University of California.
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#define XTestSERVER_SIDE
#include <X11/extensions/xtestext1.h>
......
......@@ -69,8 +69,8 @@ University of California.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "gcstruct.h"
#include "extnsionst.h"
#include "dixstruct.h"
......
......@@ -54,7 +54,7 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "misc.h"
#include "scrnintstr.h"
#include "windowstr.h"
#include "pixmapstr.h"
......
......@@ -81,8 +81,8 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "scrnintstr.h"
#include "windowstr.h"
#include "pixmapstr.h"
......
......@@ -8,8 +8,8 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
#include <X11/os.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "resource.h"
#include "scrnintstr.h"
......
......@@ -77,7 +77,7 @@ copyright holders.
#include "screenint.h"
#include "input.h"
#include "cursor.h"
#include <X11/misc.h>
#include "misc.h"
#include "windowstr.h"
#include "inputstr.h"
......@@ -94,7 +94,7 @@ typedef char *XPointer;
#include "DiPrint.h"
#include "attributes.h"
#include <X11/os.h>
#include "os.h"
#include "spooler.h"
static void GenericScreenInit(
......
......@@ -45,7 +45,7 @@ copyright holders.
#include <stdio.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include <X11/extensions/Print.h>
......
......@@ -62,7 +62,7 @@ copyright holders.
#include <X11/X.h>
#include "dixstruct.h"
#include "screenint.h"
#include <X11/misc.h>
#include "misc.h"
#include "scrnintstr.h"
#include <X11/fonts/fontstruct.h>
......
......@@ -77,7 +77,7 @@ typedef char *XPointer;
#define Status int
#define True 1
#define False 0
#include <X11/misc.h>
#include "misc.h"
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -112,7 +112,7 @@ typedef char *XPointer;
#define False 0
#endif
#include <X11/misc.h>
#include "misc.h"
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -80,7 +80,7 @@ in this Software without prior written authorization from The Open Group.
#include <stdlib.h>
#include <stdio.h>
#include <X11/os.h>
#include "os.h"
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
#ifdef XP_USE_FREETYPE
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
#include <stdlib.h>
#include <stdio.h>
#include <X11/os.h>
#include "os.h"
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <errno.h>
#include <sys/wait.h>
#include <X11/os.h>
#include "os.h"
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
#include <stdlib.h>
#include <stdio.h>
#include <X11/os.h>
#include "os.h"
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -66,7 +66,7 @@ copyright holders.
#include <X11/Xproto.h>
#undef NEED_EVENTS
#include <X11/Xatom.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "scrnintstr.h"
#include "screenint.h"
......
......@@ -61,7 +61,7 @@ typedef char *XPointer;
#define Status int
#define True 1
#define False 0
#include <X11/misc.h>
#include "misc.h"
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -38,7 +38,7 @@ copyright holders.
#include <stdio.h>
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "dixstruct.h"
#include "scrnintstr.h"
#include "screenint.h"
......
......@@ -54,7 +54,7 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "afb.h"
#include "maskbits.h"
#include "miline.h"
......
......@@ -53,7 +53,7 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "afb.h"
#include "maskbits.h"
#include "miline.h"
......
......@@ -56,7 +56,7 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/misc.h>
#include "misc.h"
#include "region.h"
#include "gc.h"
#include "windowstr.h"
......
......@@ -53,7 +53,7 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "cursor.h"
#include "scrnintstr.h"
......
......@@ -56,7 +56,7 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/misc.h>
#include "misc.h"
#include "regionstr.h"
#include "gcstruct.h"
#include "windowstr.h"
......
......@@ -51,7 +51,7 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "cfb.h"
#include "cfbmskbits.h"
#include "servermd.h"
......
......@@ -51,7 +51,7 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/misc.h>
#include "misc.h"
#include "cfb.h"
#include "cfbmskbits.h"
#include "miline.h"
......
......@@ -55,7 +55,7 @@ SOFTWARE.
#include <X11/Xmd.h>
#include "servermd.h"
#include <X11/misc.h>
#include "misc.h"
#include "region.h"
#include "gc.h"
#include "windowstr.h"
......
......@@ -55,7 +55,7 @@ SOFTWARE.
#include <X11/Xmd.h>
#include "servermd.h"
#include <X11/misc.h>
#include "misc.h"
#include "regionstr.h"
#include "gcstruct.h"
#include "windowstr.h"
......
......@@ -29,9 +29,9 @@
#ifndef _COMPINT_H_
#define _COMPINT_H_
#include <X11/misc.h>
#include "misc.h"
#include "scrnintstr.h"
#include <X11/os.h>
#include "os.h"
#include "regionstr.h"
#include "validate.h"
#include "windowstr.h"
......
......@@ -32,8 +32,8 @@
#define NEED_EVENTS