diff options
Diffstat (limited to 'Xext')
-rw-r--r-- | Xext/appgroup.c | 2 | ||||
-rw-r--r-- | Xext/bigreq.c | 4 | ||||
-rw-r--r-- | Xext/cup.c | 2 | ||||
-rw-r--r-- | Xext/dpms.c | 4 | ||||
-rw-r--r-- | Xext/fontcache.c | 2 | ||||
-rw-r--r-- | Xext/mbuf.c | 2 | ||||
-rw-r--r-- | Xext/mbufbf.c | 4 | ||||
-rw-r--r-- | Xext/mbufpx.c | 4 | ||||
-rw-r--r-- | Xext/mitmisc.c | 4 | ||||
-rw-r--r-- | Xext/panoramiX.c | 2 | ||||
-rw-r--r-- | Xext/panoramiX.h | 2 | ||||
-rw-r--r-- | Xext/panoramiXSwap.c | 2 | ||||
-rw-r--r-- | Xext/panoramiXprocs.c | 2 | ||||
-rw-r--r-- | Xext/saver.c | 6 | ||||
-rw-r--r-- | Xext/security.c | 2 | ||||
-rw-r--r-- | Xext/shape.c | 6 | ||||
-rw-r--r-- | Xext/shm.c | 4 | ||||
-rw-r--r-- | Xext/sleepuntil.c | 2 | ||||
-rw-r--r-- | Xext/sync.c | 4 | ||||
-rw-r--r-- | Xext/xcmisc.c | 4 | ||||
-rw-r--r-- | Xext/xevie.c | 4 | ||||
-rw-r--r-- | Xext/xf86bigfont.c | 4 | ||||
-rw-r--r-- | Xext/xprint.c | 2 | ||||
-rw-r--r-- | Xext/xres.c | 6 | ||||
-rw-r--r-- | Xext/xtest.c | 6 | ||||
-rw-r--r-- | Xext/xtest1dd.c | 2 | ||||
-rw-r--r-- | Xext/xtest1di.c | 6 | ||||
-rw-r--r-- | Xext/xvdisp.c | 4 | ||||
-rw-r--r-- | Xext/xvmain.c | 6 | ||||
-rw-r--r-- | Xext/xvmc.c | 4 |
30 files changed, 54 insertions, 54 deletions
diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 9d84f92d4..b8fb4420a 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -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" diff --git a/Xext/bigreq.c b/Xext/bigreq.c index d71a9afe3..65b25a909 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -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> diff --git a/Xext/cup.c b/Xext/cup.c index 2ada50f63..55b2930c1 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -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" diff --git a/Xext/dpms.c b/Xext/dpms.c index de0ca6650..093410336 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -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" diff --git a/Xext/fontcache.c b/Xext/fontcache.c index c45b00ffe..b49a0d417 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -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" diff --git a/Xext/mbuf.c b/Xext/mbuf.c index d8d73aa8e..be520b0f8 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -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" diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index a9ba78b3a..10550dc37 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -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" diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 11c997b79..1a96d0097 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -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" diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index c2a27e0f6..e32642b28 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -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_ diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 5eb5c1f3c..f2a8a7cd5 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -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" diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index fb212fd00..c4faa5a9a 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,5 +1,5 @@ /* $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. diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index dcd9fc227..d86b744cd 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -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" diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 0b95af6af..5a3060839 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -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" diff --git a/Xext/saver.c b/Xext/saver.c index 23c40bc37..0597bea9f 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/security.c b/Xext/security.c index 736598faa..75ca16765 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,4 +1,4 @@ -/* $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 $ */ /* diff --git a/Xext/shape.c b/Xext/shape.c index 50a403443..bf07eb180 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/shm.c b/Xext/shm.c index 474020eb1..de791c8bd 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -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" diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 20f3a1f96..ce925adc5 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -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" diff --git a/Xext/sync.c b/Xext/sync.c index 2e4d247f0..110ce206a 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -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" diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 9b3780774..dbd9496d7 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -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" diff --git a/Xext/xevie.c b/Xext/xevie.c index 947e39f3a..d33f027a9 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -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" diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 51bac86ce..761483441 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -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" diff --git a/Xext/xprint.c b/Xext/xprint.c index 14790d6f7..965374fe1 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -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" diff --git a/Xext/xres.c b/Xext/xres.c index ca6e5bbc3..7a8fa50b4 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -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" diff --git a/Xext/xtest.c b/Xext/xtest.c index 7e81ce53d..e9876b2b8 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 686ff72df..1681d6c50 100644 --- a/Xext/xtest1dd.c +++ b/Xext/xtest1dd.c @@ -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> diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index b6fb36ff1..cb8c86aae 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index b96565c68..bf18e4587 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 00406373e..e6c644407 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,4 @@ -/* $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" diff --git a/Xext/xvmc.c b/Xext/xvmc.c index e533393df..05424fe02 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -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" |