diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/closestr.h | 2 | ||||
-rw-r--r-- | include/cursor.h | 4 | ||||
-rw-r--r-- | include/extnsionst.h | 2 | ||||
-rw-r--r-- | include/globals.h | 2 | ||||
-rw-r--r-- | include/input.h | 2 | ||||
-rw-r--r-- | include/misc.h | 2 | ||||
-rw-r--r-- | include/miscstruct.h | 2 | ||||
-rw-r--r-- | include/os.h | 2 | ||||
-rw-r--r-- | include/pixmap.h | 2 | ||||
-rw-r--r-- | include/propertyst.h | 2 | ||||
-rw-r--r-- | include/regionstr.h | 2 | ||||
-rw-r--r-- | include/screenint.h | 2 | ||||
-rw-r--r-- | include/servermd.h | 2 | ||||
-rw-r--r-- | include/window.h | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/include/closestr.h b/include/closestr.h index d70f754b2..0102a737f 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -36,7 +36,7 @@ from The Open Group. #include <X11/Xproto.h> #include "closure.h" #include "dix.h" -#include "misc.h" +#include <X11/misc.h> #include "gcstruct.h" /* closure structures */ diff --git a/include/cursor.h b/include/cursor.h index 512133eb3..5f9467a2b 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.2 2004/04/23 19:54:23 eich Exp $ */ /* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ /*********************************************************** @@ -50,7 +50,7 @@ SOFTWARE. #ifndef CURSOR_H #define CURSOR_H -#include "misc.h" +#include <X11/misc.h> #include "screenint.h" #include "window.h" diff --git a/include/extnsionst.h b/include/extnsionst.h index daf37bf43..5ed009958 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H -#include "misc.h" +#include <X11/misc.h> #include "screenint.h" #include "extension.h" #include "gc.h" diff --git a/include/globals.h b/include/globals.h index 2a2a68983..924608e89 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.5 2004/09/14 00:51:24 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index bcaa01e6f..97adf6fb3 100644 --- a/include/input.h +++ b/include/input.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef INPUT_H #define INPUT_H -#include "misc.h" +#include <X11/misc.h> #include "screenint.h" #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/include/misc.h b/include/misc.h index 5944a427f..99f855f7d 100644 --- a/include/misc.h +++ b/include/misc.h @@ -114,7 +114,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */ typedef struct _xReq *xReqPtr; -#include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ +#include <X11/os.h> /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ #ifndef IN_MODULE #include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */ #endif diff --git a/include/miscstruct.h b/include/miscstruct.h index 6a16007b7..0ba871bc0 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 -#include "misc.h" +#include <X11/misc.h> #include <X11/Xprotostr.h> #include "gc.h" diff --git a/include/os.h b/include/os.h index 7823b795d..3cd0c4b65 100644 --- a/include/os.h +++ b/include/os.h @@ -51,7 +51,7 @@ SOFTWARE. #ifndef OS_H #define OS_H -#include "misc.h" +#include <X11/misc.h> #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr)) #include <X11/Xalloca.h> diff --git a/include/pixmap.h b/include/pixmap.h index 6cea329ec..1777b2407 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef PIXMAP_H #define PIXMAP_H -#include "misc.h" +#include <X11/misc.h> #include "screenint.h" /* types for Drawable */ diff --git a/include/propertyst.h b/include/propertyst.h index 177fca171..24eed070e 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H -#include "misc.h" +#include <X11/misc.h> #include "property.h" /* * PROPERTY -- property element diff --git a/include/regionstr.h b/include/regionstr.h index 14995e5f1..0af87bde8 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.8.2.1 2004/03/30 16:46:23 stukreit Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.4 2005/06/25 12:39:58 zack Exp $ */ /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** diff --git a/include/screenint.h b/include/screenint.h index 1c836952e..aaa8086fb 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef SCREENINT_H #define SCREENINT_H -#include "misc.h" +#include <X11/misc.h> typedef struct _PixmapFormat *PixmapFormatPtr; typedef struct _Visual *VisualPtr; diff --git a/include/servermd.h b/include/servermd.h index 939ff9346..66fe14034 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */ #ifndef SERVERMD_H #define SERVERMD_H 1 diff --git a/include/window.h b/include/window.h index 7c3fce092..2ffcab370 100644 --- a/include/window.h +++ b/include/window.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef WINDOW_H #define WINDOW_H -#include "misc.h" +#include <X11/misc.h> #include "region.h" #include "screenint.h" #include <X11/Xproto.h> |