diff options
Diffstat (limited to 'dix')
-rw-r--r-- | dix/colormap.c | 6 | ||||
-rw-r--r-- | dix/devices.c | 4 | ||||
-rw-r--r-- | dix/dispatch.c | 2 | ||||
-rw-r--r-- | dix/dixfonts.c | 4 | ||||
-rw-r--r-- | dix/dixutils.c | 2 | ||||
-rw-r--r-- | dix/events.c | 4 | ||||
-rw-r--r-- | dix/extension.c | 2 | ||||
-rw-r--r-- | dix/gc.c | 2 | ||||
-rw-r--r-- | dix/globals.c | 6 | ||||
-rw-r--r-- | dix/glyphcurs.c | 2 | ||||
-rw-r--r-- | dix/grabs.c | 2 | ||||
-rw-r--r-- | dix/initatoms.c | 2 | ||||
-rw-r--r-- | dix/main.c | 6 | ||||
-rw-r--r-- | dix/pixmap.c | 4 | ||||
-rw-r--r-- | dix/privates.c | 6 | ||||
-rw-r--r-- | dix/resource.c | 6 | ||||
-rw-r--r-- | dix/swaprep.c | 2 | ||||
-rw-r--r-- | dix/swapreq.c | 2 | ||||
-rw-r--r-- | dix/window.c | 6 | ||||
-rw-r--r-- | dix/xpstubs.c | 2 |
20 files changed, 36 insertions, 36 deletions
diff --git a/dix/colormap.c b/dix/colormap.c index 732267172..d64b9db23 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.6 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** @@ -52,10 +52,10 @@ SOFTWARE. #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "dix.h" #include "colormapst.h" -#include "os.h" +#include <X11/os.h> #include "scrnintstr.h" #include "resource.h" #include "windowstr.h" diff --git a/dix/devices.c b/dix/devices.c index d99fcdd36..82dabcf0f 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -48,10 +48,10 @@ SOFTWARE. /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */ #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES diff --git a/dix/dispatch.c b/dix/dispatch.c index bad17beaf..09445e038 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 6f71cb1d4..cbdd044e4 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.5 2005/04/20 13:33:54 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -59,7 +59,7 @@ Equipment Corporation. #include "resource.h" #include "dixstruct.h" #include "cursorstr.h" -#include "misc.h" +#include <X11/misc.h> #include "opaque.h" #include "dixfontstr.h" #include "closestr.h" diff --git a/dix/dixutils.c b/dix/dixutils.c index 92cc763a5..ac5636f93 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -86,7 +86,7 @@ Author: Adobe Systems Incorporated #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/dix/events.c b/dix/events.c index cbac85344..aea54187d 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.10 2005/06/10 04:01:14 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.12 2005/06/15 16:46:59 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ @@ -112,7 +112,7 @@ of the copyright holder. /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES diff --git a/dix/extension.c b/dix/extension.c index bbd179a8b..f65565df2 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -51,7 +51,7 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "dixstruct.h" #include "extnsionst.h" #include "gcstruct.h" @@ -51,7 +51,7 @@ SOFTWARE. #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "resource.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/dix/globals.c b/dix/globals.c index c7190f6c0..3c15c5a0a 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.3 2004/09/22 17:20:55 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ @@ -51,14 +51,14 @@ SOFTWARE. #include <X11/X.h> #include <X11/Xmd.h> -#include "misc.h" +#include <X11/misc.h> #include "windowstr.h" #include "scrnintstr.h" #include "input.h" #include "dixfont.h" #include "site.h" #include "dixstruct.h" -#include "os.h" +#include <X11/os.h> ScreenInfo screenInfo; KeybdCtrl defaultKeyboardControl = { diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c index 88b3bb895..5499cabc5 100644 --- a/dix/glyphcurs.c +++ b/dix/glyphcurs.c @@ -47,7 +47,7 @@ SOFTWARE. /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "misc.h" +#include <X11/misc.h> #include "fontstruct.h" #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/dix/grabs.c b/dix/grabs.c index 5a767a641..5887d2aab 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -49,7 +49,7 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #define NEED_EVENTS #include <X11/Xproto.h> #include "windowstr.h" diff --git a/dix/initatoms.c b/dix/initatoms.c index 8253a7274..96b758b77 100644 --- a/dix/initatoms.c +++ b/dix/initatoms.c @@ -5,7 +5,7 @@ #include <X11/X.h> #include <X11/Xatom.h> -#include "misc.h" +#include <X11/misc.h> #include "dix.h" void MakePredeclaredAtoms() { diff --git a/dix/main.c b/dix/main.c index 87ff45a36..a8e4f05a4 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.11 2005/05/22 01:12:49 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -84,8 +84,8 @@ Equipment Corporation. #include <X11/Xos.h> /* for unistd.h */ #include <X11/Xproto.h> #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include <X11/misc.h> +#include <X11/os.h> #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/pixmap.c b/dix/pixmap.c index 18e7b9394..eef23673f 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -30,8 +30,8 @@ from The Open Group. #include <X11/X.h> #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include <X11/misc.h> +#include <X11/os.h> #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/privates.c b/dix/privates.c index a8f3ee9aa..905fe3d50 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -1,5 +1,5 @@ /* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/dix/privates.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -31,8 +31,8 @@ from The Open Group. #include <X11/X.h> #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include <X11/misc.h> +#include <X11/os.h> #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/resource.c b/dix/resource.c index f0035f48a..9f3794bd3 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -74,7 +74,7 @@ Equipment Corporation. ******************************************************************/ /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.4 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.5 2005/04/20 12:25:19 daniels Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -103,8 +103,8 @@ Equipment Corporation. #define NEED_EVENTS #include <X11/X.h> -#include "misc.h" -#include "os.h" +#include <X11/misc.h> +#include <X11/os.h> #include "resource.h" #include "dixstruct.h" #include "opaque.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 1c6da139f..5d1284c08 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -52,7 +52,7 @@ SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "dixstruct.h" #include "fontstruct.h" #include "scrnintstr.h" diff --git a/dix/swapreq.c b/dix/swapreq.c index 8f9036da1..2e8acaee9 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -52,7 +52,7 @@ SOFTWARE. #define NEED_EVENTS #include <X11/Xproto.h> #include <X11/Xprotostr.h> -#include "misc.h" +#include <X11/misc.h> #include "dixstruct.h" #include "extnsionst.h" /* for SendEvent */ #include "swapreq.h" diff --git a/dix/window.c b/dix/window.c index ac6f775ba..858d65089 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.7 2005/03/07 23:02:59 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -80,9 +80,9 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ -#include "misc.h" +#include <X11/misc.h> #include "scrnintstr.h" -#include "os.h" +#include <X11/os.h> #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index f7f37b64a..5f69e6119 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -27,7 +27,7 @@ from The Open Group. /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */ -#include "misc.h" +#include <X11/misc.h> #include "font.h" #ifdef XPRINT #include "DiPrint.h" |