diff options
author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /hw/xfree86/ramdac | |
parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'hw/xfree86/ramdac')
-rw-r--r-- | hw/xfree86/ramdac/BT.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/BT.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/BTPriv.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/IBM.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/IBM.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/IBMPriv.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/TI.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/TI.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/TIPriv.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86CursorPriv.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86HWCurs.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86RamDac.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86RamDac.h | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86RamDacCmap.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86RamDacMod.c | 4 | ||||
-rw-r--r-- | hw/xfree86/ramdac/xf86RamDacPriv.h | 4 |
18 files changed, 72 insertions, 0 deletions
diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 440b0021b..346b902dd 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a745..f01357a09 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 67469d2ed..17edaefdc 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "BT.h" typedef struct { diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 4fede5720..bf9b729d8 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index eb211883c..14543287a 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 1a2bf2065..994296517 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "IBM.h" typedef struct { diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 024cb49eb..e945dab10 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -26,6 +26,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f33247cfc..05fabb4b2 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock, diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index 81fe844a1..d66149dcf 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "TI.h" typedef struct { diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index eedb00377..f8efa8f71 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "xf86CursorPriv.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f..ff5a7c745 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 603f8ecd0..cbe62546b 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 675fce09c..527638fac 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 7821e591c..1182a3e39 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b577..92795a89a 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index b33ea8de0..6a59b4bb7 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index 0fe5ce6aa..d87defc16 100644 --- a/hw/xfree86/ramdac/xf86RamDacMod.c +++ b/hw/xfree86/ramdac/xf86RamDacMod.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index 45680a05b..ae5fc72c5 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" #include "xf86cmap.h" |