diff options
Diffstat (limited to 'hw/xfree86')
59 files changed, 1 insertions, 236 deletions
diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index 8b3e303d7..d37f5b0f0 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -50,10 +50,6 @@ /* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _ATKEYNAMES_H #define _ATKEYNAMES_H diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 86f237675..b7d813329 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -50,10 +50,6 @@ /* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _COMPILER_H # if !defined(_XF86_ANSIC_H) && defined(XFree86Module) diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h index 164678ec2..e60aa4e83 100644 --- a/hw/xfree86/common/fourcc.h +++ b/hw/xfree86/common/fourcc.h @@ -34,10 +34,6 @@ For an explanation of fourcc <-> guid mappings see RFC2361. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_FOURCC_H_ #define _XF86_FOURCC_H_ 1 diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index d73e9ddbe..2a1246bdd 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -34,10 +34,6 @@ * "public" means available to video drivers. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_H #define _XF86_H diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 44643d9b1..f0ac3bd59 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -40,10 +40,6 @@ * XXX This file arguably belongs in xfree86/loader/. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86MODULE_H #define _XF86MODULE_H diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h index d207ec0a9..718732353 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -29,10 +29,6 @@ /* Option handling things that ModuleSetup procs can use */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_OPT_H_ #define _XF86_OPT_H_ diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index 12cf3dd62..183797e24 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -46,11 +46,6 @@ * to ../etc/extrapci.ids. */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_PCIINFO_H #define _XF86_PCIINFO_H diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 15456f906..cbd1172e4 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -34,10 +34,6 @@ * "private" means not available to video drivers. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86PRIV_H #define _XF86PRIV_H diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index cbec1ade7..93d64fd51 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -32,10 +32,6 @@ * None of the data structures here should be used by video drivers. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86PRIVSTR_H #define _XF86PRIVSTR_H diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index 6ba347f34..ce2c62bb3 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_RESOURCES_H #define _XF86_RESOURCES_H diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index f0652fcb0..45746bc90 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -28,10 +28,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef XF86_VERSION_CURRENT #define XF86_VERSION_MAJOR 4 diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index e45fd0f4d..0c20f78fe 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -51,10 +51,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.36 2003/08/24 17:36:55 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _xf86Xinput_h #define _xf86Xinput_h diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index 25e17e54c..4291b971a 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86CMAP_H #define _XF86CMAP_H diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index 3ea0248bf..adb26a1f1 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86FBMAN_H #define _XF86FBMAN_H diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 39688e569..81c1b84ac 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -22,10 +22,6 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 9a1e2bf92..a90b5483d 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -32,10 +32,6 @@ * Any data structures that video drivers need to access should go here. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86STR_H #define _XF86STR_H diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index 258848b24..316d6c9e5 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86XV_H_ #define _XF86XV_H_ diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index 97eef7093..0b073aac8 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86XVMC_H #define _XF86XVMC_H diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h index 7b0b5376d..0d1efdafb 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86XVPRIV_H_ #define _XF86XVPRIV_H_ diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 1e917a138..39ae2ee11 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -26,10 +26,6 @@ */ /* $XFree86$ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index de7f6f6b2..47005320a 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -27,10 +27,6 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef XORG_VERSION_H # define XORG_VERSION_H diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index a14b48284..f7e7a76ba 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -10,10 +10,6 @@ * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _EDID_H_ #define _EDID_H_ diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 002cebba8..5c129aef0 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index c6ded82a1..8c7c67164 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -10,11 +10,6 @@ * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef XF86_DDC_H # define XF86_DDC_H diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index 06c55e009..eb9791098 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 52acad959..bfb0d64a8 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -34,10 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* Prototypes for DRI functions */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _DRI_H_ #include "scrnintstr.h" diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 47335ed04..cf1b1eacf 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -32,10 +32,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DRI_STRUCT_H #define DRI_STRUCT_H diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index dd33c87a4..77c16e0ef 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -36,10 +36,6 @@ /* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index 584ad4db2..cfc3fcdb6 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index 035d49a51..81765e4a9 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -3,9 +3,6 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index d88221a89..9e137df41 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -6,10 +6,6 @@ * Copyright 1999 Egbert Eich */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86INT10_H #define _XF86INT10_H diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index 1cf84353b..13cc2f3e0 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,7 +1,4 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.13 2003/08/24 17:37:03 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 886c830fb..a8b7ef492 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -102,10 +102,6 @@ * Drivers should use this file rather than Pci.h. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86PCI_H #define _XF86PCI_H 1 #include <X11/Xarch.h> diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index fa2253655..344f7e901 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -28,10 +28,6 @@ * Author: Ivan Pascal. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #include "xf86Xinput.h" Bool ATScancode(InputInfoPtr pInfo, int *scanCode); diff --git a/hw/xfree86/os-support/xf86OSmouse.h b/hw/xfree86/os-support/xf86OSmouse.h index 879262991..7cb732237 100644 --- a/hw/xfree86/os-support/xf86OSmouse.h +++ b/hw/xfree86/os-support/xf86OSmouse.h @@ -28,10 +28,6 @@ /* Public interface to OS-specific mouse support. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86OSMOUSE_H_ #define _XF86OSMOUSE_H_ diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 62ecd6762..76e8d010e 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -74,10 +74,6 @@ * may include xf86_OSproc.h to get prototypes for public interfaces. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_OSLIB_H #define _XF86_OSLIB_H diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 555e7eef1..74ec766e2 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -66,10 +66,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H @@ -238,6 +234,7 @@ extern void xf86KbdEvents(void); extern int xf86XqueKbdProc(DeviceIntPtr, int); extern void xf86XqueEvents(void); #endif +extern void xf86ReloadInputDevs(int sig); #ifdef WSCONS_SUPPORT extern void xf86WSKbdEvents(void); #endif diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 6d2352cd6..733a5543d 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -23,10 +23,6 @@ * */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XF86_ANSIC_H #define _XF86_ANSIC_H diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index ecdbfeac5..5f0f78f02 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -42,10 +42,6 @@ * 0.1 Feb 24 1997 hide the trivial functions mem* str* */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef XF86_LIBC_H #define XF86_LIBC_H 1 diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 438c6acb1..783d79b93 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index f01357a09..c52b5a745 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,9 +1,5 @@ /* $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/IBM.h b/hw/xfree86/ramdac/IBM.h index 14543287a..eb211883c 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,9 +1,5 @@ /* $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/TI.h b/hw/xfree86/ramdac/TI.h index 05fabb4b2..f33247cfc 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,9 +1,5 @@ /* $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/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ff5a7c745..ac88f4e5f 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,9 +1,5 @@ /* $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/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 92795a89a..319a7b577 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,9 +1,5 @@ /* $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/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index d177c5f1b..e42822600 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 14e8f1a1a..32515462e 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -10,10 +10,6 @@ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _VBE_H #define _VBE_H #include "xf86int10.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index a716f26be..2a8d1b33a 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -29,10 +29,6 @@ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _VBE_MODES_H /* diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 5fb114073..c200aee9a 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -11,10 +11,6 @@ * Author: Dirk Hohndel */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _VGAHW_H #define _VGAHW_H diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index fb31fc172..d4ff7bbd8 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaWrapper.h b/hw/xfree86/xaa/xaaWrapper.h index 9f413f4f7..a141d8421 100644 --- a/hw/xfree86/xaa/xaaWrapper.h +++ b/hw/xfree86/xaa/xaaWrapper.h @@ -1,6 +1,3 @@ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif #ifndef _XAA_WRAPPER_H # define _XAA_WRAPPER_H diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index e01fa7894..883e64d5b 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index e3f540516..1c95727b3 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -29,10 +29,6 @@ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _XAAROP_H #define _XAAROP_H diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index 832c72720..12695003c 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 24c3262b7..454091538 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/xf1bpp.h b/hw/xfree86/xf1bpp/xf1bpp.h index 885358bb5..18104a77e 100644 --- a/hw/xfree86/xf1bpp/xf1bpp.h +++ b/hw/xfree86/xf1bpp/xf1bpp.h @@ -25,10 +25,6 @@ * XFree86 Project. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef __XF1BPP_H__ #define __XF1BPP_H__ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 8d6ccb644..1f465374e 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,10 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef __XF4BPP_H__ #define __XF4BPP_H__ diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index b02000493..97586ba01 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _CFB8_16_H #define _CFB8_16_H diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h index e1b81f967..1d1093e54 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,9 +1,5 @@ /* $XFree86$ */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #ifndef _CFB8_32WID_H #define _CFB8_32WID_H |