Commit 9b1debcd authored by Daniel Stone's avatar Daniel Stone

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

parent 657b4cb8
/* $XdotOrg$ */
/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.2 2004/04/23 18:44:40 eich Exp $ */
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
......@@ -61,7 +61,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 "misc.h" /* Server swapping macros */
#include <X11/misc.h> /* Server swapping macros */
#include "dixstruct.h" /* Server ClientRec definitions */
#include "resource.h" /* Used with the MakeAtom call */
#ifdef PC
......
......@@ -52,7 +52,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 "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#ifdef PC
# include "extnsist.h"
......
......@@ -42,7 +42,7 @@ SOFTWARE.
#include <X11/Xprotostr.h>
#include <X11/extensions/xtrapdi.h>
#include "input.h" /* Server DevicePtr definitions */
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#ifdef PC
# include "extnsist.h"
......
......@@ -30,7 +30,7 @@ from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "scrnintstr.h"
......
......@@ -31,8 +31,8 @@ from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include <X11/extensions/bigreqstr.h>
......
......@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "colormapst.h"
......
......@@ -37,8 +37,8 @@ Equipment Corporation.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "opaque.h"
......
......@@ -35,7 +35,7 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "scrnintstr.h"
......
......@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "window.h"
#include "os.h"
#include <X11/os.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#define _MITMISC_SERVER_
......
......@@ -30,7 +30,7 @@ Equipment Corporation.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xarch.h>
#include "misc.h"
#include <X11/misc.h>
#include "cursor.h"
#include "cursorstr.h"
#include "extnsionst.h"
......
/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.2 2004/04/23 18:44:41 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
......
......@@ -28,7 +28,7 @@ Equipment Corporation.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "cursor.h"
#include "cursorstr.h"
#include "extnsionst.h"
......
......@@ -41,7 +41,7 @@ Equipment Corporation.
#include "opaque.h"
#include "inputstr.h"
#include "migc.h"
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "panoramiX.h"
#include "panoramiXsrv.h"
......
/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.6 2005/03/23 21:09:48 herrb Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.7 2005/04/20 12:25:12 daniels Exp $ */
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
*
......@@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
/*
......
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.6 2005/06/10 04:01:14 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
......@@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -45,8 +45,8 @@ in this Software without prior written authorization from The Open Group.
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "resource.h"
#include "scrnintstr.h"
......
......@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
#include "sleepuntil.h"
#include <X11/X.h>
#include <X11/Xmd.h>
#include "misc.h"
#include <X11/misc.h>
#include "windowstr.h"
#include "dixstruct.h"
#include "pixmapstr.h"
......
......@@ -57,8 +57,8 @@ PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xmd.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
......
......@@ -32,8 +32,8 @@ from The Open Group.
#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
......
......@@ -30,13 +30,13 @@ or other dealings in this Software without prior written authorization
of the copyright holder.
************************************************************/
/* $XdotOrg: $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xevie.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "colormapst.h"
......
......@@ -62,8 +62,8 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "gcstruct.h"
#include "dixfontstr.h"
......
......@@ -72,7 +72,7 @@ copyright holders.
#define NEED_EVENTS
#include <X11/Xproto.h>
#undef NEED_EVENTS
#include "misc.h"
#include <X11/misc.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
......
......@@ -2,14 +2,14 @@
Copyright (c) 2002 XFree86 Inc
*/
/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
......
/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
......@@ -32,8 +32,8 @@ from The Open Group.
#include <X11/X.h>
#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "extnsionst.h"
#include "windowstr.h"
......
......@@ -66,7 +66,7 @@ University of California.
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#define XTestSERVER_SIDE
#include <X11/extensions/xtestext1.h>
......
/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
* File: xtest1di.c
......@@ -65,8 +65,8 @@ University of California.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "gcstruct.h"
#include "extnsionst.h"
#include "dixstruct.h"
......
/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
......@@ -50,7 +50,7 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include <X11/misc.h>
#include "scrnintstr.h"
#include "windowstr.h"
#include "pixmapstr.h"
......
/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
......@@ -77,8 +77,8 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "scrnintstr.h"
#include "windowstr.h"
#include "pixmapstr.h"
......
......@@ -4,8 +4,8 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include <X11/misc.h>
#include <X11/os.h>
#include "dixstruct.h"
#include "resource.h"
#include "scrnintstr.h"
......
......@@ -73,7 +73,7 @@ copyright holders.
#include "screenint.h"
#include "input.h"
#include "cursor.h"
#include "misc.h"
#include <X11/misc.h>
#include "windowstr.h"
#include "inputstr.h"
......@@ -90,7 +90,7 @@ typedef char *XPointer;
#include "DiPrint.h"
#include "attributes.h"
#include "os.h"
#include <X11/os.h>
#include "spooler.h"
static void GenericScreenInit(
......
......@@ -41,7 +41,7 @@ copyright holders.
#include <stdio.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include <X11/extensions/Print.h>
......
......@@ -58,7 +58,7 @@ copyright holders.
#include <X11/X.h>
#include "dixstruct.h"
#include "screenint.h"
#include "misc.h"
#include <X11/misc.h>
#include "scrnintstr.h"
#include "fontstruct.h"
......
......@@ -73,7 +73,7 @@ typedef char *XPointer;
#define Status int
#define True 1
#define False 0
#include "misc.h"
#include <X11/misc.h>
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -108,7 +108,7 @@ typedef char *XPointer;
#define False 0
#endif
#include "misc.h"
#include <X11/misc.h>
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -76,7 +76,7 @@ in this Software without prior written authorization from The Open Group.
#include <stdlib.h>
#include <stdio.h>
#include "os.h"
#include <X11/os.h>
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
#ifdef XP_USE_FREETYPE
......
......@@ -23,7 +23,7 @@ THE SOFTWARE.
#include <stdlib.h>
#include <stdio.h>
#include "os.h"
#include <X11/os.h>
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
#include <errno.h>
#include <sys/wait.h>
#include "os.h"
#include <X11/os.h>
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -23,7 +23,7 @@ THE SOFTWARE.
#include <stdlib.h>
#include <stdio.h>
#include "os.h"
#include <X11/os.h>
#define USE_PSOUT_PRIVATE 1
#include "psout.h"
......
......@@ -62,7 +62,7 @@ copyright holders.
#include <X11/Xproto.h>
#undef NEED_EVENTS
#include <X11/Xatom.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "scrnintstr.h"
#include "screenint.h"
......
......@@ -57,7 +57,7 @@ typedef char *XPointer;
#define Status int
#define True 1
#define False 0
#include "misc.h"
#include <X11/misc.h>
#include <X11/Xfuncproto.h>
#include <X11/Xresource.h>
#include "attributes.h"
......
......@@ -34,7 +34,7 @@ copyright holders.
#include <stdio.h>
#include <X11/X.h>
#include "misc.h"
#include <X11/misc.h>
#include "dixstruct.h"
#include "scrnintstr.h"
#include "screenint.h"
......
......@@ -50,7 +50,7 @@ SOFTWARE.
/* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */
#include <X11/X.h>
#include "misc.h"
#include <X11/misc.h>
#include "afb.h"
#include "maskbits.h"
#include "miline.h"
......
......@@ -49,7 +49,7 @@ SOFTWARE.
/* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */
#include <X11/X.h>
#include "misc.h"
#include <X11/misc.h>
#include "afb.h"
#include "maskbits.h"
#include "miline.h"
......