diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-24 11:18:35 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-24 11:18:35 +0000 |
| commit | 825a95a1fab69f84c99ae132888fced22e28be33 (patch) | |
| tree | e6a6a9b00f8eb91e001d0a18d27c5ad9a72daf45 | |
| parent | 1fb4a5a4ea993a7913a7bcc362315d31b2907836 (diff) | |
Remove use of dix-config and xorg-config.h from public headers.
135 files changed, 1 insertions, 535 deletions
diff --git a/Xext/xvdix.h b/Xext/xvdix.h index c2dfc7c82..99d918406 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -23,10 +23,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef XVDIX_H #define XVDIX_H /* diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index 77af41d41..c7eba30ad 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _XVMC_H #define _XVMC_H #include <X11/extensions/Xv.h> @@ -52,10 +52,6 @@ SOFTWARE. written by drewry, september 1986 */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include "pixmap.h" #include "region.h" #include "gc.h" @@ -29,10 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) #include <X11/X.h> diff --git a/cfb/cfb16.h b/cfb/cfb16.h index 1ad8972ef..3d51cd142 100644 --- a/cfb/cfb16.h +++ b/cfb/cfb16.h @@ -25,10 +25,6 @@ * XFree86 Project. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _CFB16_H_ #define _CFB16_H_ diff --git a/cfb/cfb32.h b/cfb/cfb32.h index 48b48cbaf..5ea4c13c8 100644 --- a/cfb/cfb32.h +++ b/cfb/cfb32.h @@ -25,10 +25,6 @@ * XFree86 Project. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _CFB32_H_ #define _CFB32_H_ diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 9ed10acaa..802517aac 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -32,10 +32,6 @@ in this Software without prior written authorization from The Open Group. * Map names around so that multiple depths can be supported simultaneously */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #if 0 #undef QuartetBitsTable #undef QuartetPixelMaskTable diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index 8d6f118df..a803cac72 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -31,10 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 35deae8a9..69135a837 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -32,11 +32,6 @@ *****************************************************************************/ /* $XFree86$ */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DBE_STRUCT_H #define DBE_STRUCT_H @@ -24,10 +24,6 @@ /* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.9 2005/04/20 12:25:19 daniels Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _FB_H_ #define _FB_H_ diff --git a/fb/fboverlay.h b/fb/fboverlay.h index a0eb8c7c4..e6a4e033f 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -23,10 +23,6 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _FBOVERLAY_H_ #define _FBOVERLAY_H_ diff --git a/fb/fbpseudocolor.h b/fb/fbpseudocolor.h index c653fbcab..64de71db8 100644 --- a/fb/fbpseudocolor.h +++ b/fb/fbpseudocolor.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _FB_XX_H_ # define _FB_XX_H_ diff --git a/fb/fbrop.h b/fb/fbrop.h index 541071b19..65f62c393 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -23,10 +23,6 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _FBROP_H_ #define _FBROP_H_ 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 diff --git a/include/XIstubs.h b/include/XIstubs.h index 940604887..e005493c4 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef XI_STUBS_H #define XI_STUBS_H 1 diff --git a/include/bstore.h b/include/bstore.h index 22dd02828..098abcd86 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -15,10 +15,6 @@ * -- 1997.10.27 Marc Aurele La France (tsi@xfree86.org) */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _BSTORE_H_ #define _BSTORE_H_ diff --git a/include/bstorestr.h b/include/bstorestr.h index 8452396d0..8f21855c4 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -15,10 +15,6 @@ * -- 1997.10.27 Marc Aurele La France (tsi@xfree86.org) */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _BSTORESTR_H_ #define _BSTORESTR_H_ diff --git a/include/closestr.h b/include/closestr.h index 64f348448..d70f754b2 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -29,10 +29,6 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef CLOSESTR_H #define CLOSESTR_H diff --git a/include/closure.h b/include/closure.h index b8f21f9d7..839303c96 100644 --- a/include/closure.h +++ b/include/closure.h @@ -45,9 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef CLOSURE_H #define CLOSURE_H 1 diff --git a/include/colormap.h b/include/colormap.h index baf3dcdb5..1f2c33075 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -47,10 +47,6 @@ SOFTWARE. */ /* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef CMAP_H #define CMAP_H 1 diff --git a/include/colormapst.h b/include/colormapst.h index 519ead1f0..5ceee9870 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -45,9 +45,6 @@ SOFTWARE. */ /* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 diff --git a/include/cursor.h b/include/cursor.h index 6f8c0a24f..d51cc79e6 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -47,9 +47,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef CURSOR_H #define CURSOR_H diff --git a/include/cursorstr.h b/include/cursorstr.h index b4ce35c6e..c877d6cc9 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index 1ad1cbc8a..1b8fc4265 100644 --- a/include/dix.h +++ b/include/dix.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIX_H #define DIX_H diff --git a/include/dixevents.h b/include/dixevents.h index 96ae17149..46a5faef0 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIXEVENTS_H #define DIXEVENTS_H diff --git a/include/dixfont.h b/include/dixfont.h index 1d249b302..c6b8676da 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -23,10 +23,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIXFONT_H #define DIXFONT_H 1 diff --git a/include/dixfontstr.h b/include/dixfontstr.h index ba696c56f..948bf1adb 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -22,10 +22,6 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIXFONTSTRUCT_H #define DIXFONTSTRUCT_H diff --git a/include/dixgrabs.h b/include/dixgrabs.h index cb07c6d11..042e063db 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIXGRABS_H #define DIXGRABS_H 1 diff --git a/include/dixstruct.h b/include/dixstruct.h index 5c1281ab2..d7d810272 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -23,10 +23,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef DIXSTRUCT_H #define DIXSTRUCT_H diff --git a/include/exevents.h b/include/exevents.h index fdd253c85..91c7acb6b 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -28,10 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Interface of 'exevents.c' */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef EXEVENTS_H #define EXEVENTS_H diff --git a/include/extension.h b/include/extension.h index 7d4e4accb..34750173b 100644 --- a/include/extension.h +++ b/include/extension.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 3dcf179e1..37fa9a245 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -28,10 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Interface of extinit.c */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef EXTINIT_H #define EXTINIT_H diff --git a/include/extnsionst.h b/include/extnsionst.h index b5b02dabe..daf37bf43 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index b4a3b3af2..77c2f20c6 100644 --- a/include/gc.h +++ b/include/gc.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef GC_H #define GC_H diff --git a/include/gcstruct.h b/include/gcstruct.h index a8f2ad0be..c2226ba17 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -49,10 +49,6 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index 775409183..924608e89 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,10 +1,6 @@ /* $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 $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index f51dc44f0..bcaa01e6f 100644 --- a/include/input.h +++ b/include/input.h @@ -47,10 +47,6 @@ SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index 9d0bf4057..b54e8a1d5 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -48,10 +48,6 @@ SOFTWARE. /* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef INPUTSTRUCT_H #define INPUTSTRUCT_H diff --git a/include/miscstruct.h b/include/miscstruct.h index f58b678c6..6a16007b7 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index 277ca61ac..ca29afdc0 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -28,10 +28,6 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/pixmap.h b/include/pixmap.h index 64702fa29..6cea329ec 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 465e7bcb7..22a1f1025 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H #include "pixmap.h" diff --git a/include/property.h b/include/property.h index 6b8988112..21a38d51c 100644 --- a/include/property.h +++ b/include/property.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index daac37e13..177fca171 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H #include "misc.h" diff --git a/include/region.h b/include/region.h index 0c67fe9ee..0340b0db6 100644 --- a/include/region.h +++ b/include/region.h @@ -45,9 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef REGION_H #define REGION_H diff --git a/include/regionstr.h b/include/regionstr.h index dfee705a9..0af87bde8 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -48,10 +48,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H diff --git a/include/resource.h b/include/resource.h index 260c7ebb0..49c189869 100644 --- a/include/resource.h +++ b/include/resource.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef RESOURCE_H #define RESOURCE_H 1 #include "misc.h" diff --git a/include/rgb.h b/include/rgb.h index 45f44d738..5741a4efa 100644 --- a/include/rgb.h +++ b/include/rgb.h @@ -46,10 +46,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef RGB_H #define RGB_H typedef struct _RGB { diff --git a/include/screenint.h b/include/screenint.h index c3a7204e1..74d5e14a0 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -46,9 +46,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index a0e103a4e..ef9358689 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/selection.h b/include/selection.h index fa6abca65..9e6edfbd9 100644 --- a/include/selection.h +++ b/include/selection.h @@ -1,7 +1,4 @@ /* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifndef SELECTION_H #define SELECTION_H 1 diff --git a/include/servermd.h b/include/servermd.h index 73f339b99..99b8c4c6e 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -48,10 +48,6 @@ SOFTWARE. /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ /* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef SERVERMD_H #define SERVERMD_H 1 diff --git a/include/site.h b/include/site.h index 5b0c69381..be8c003da 100644 --- a/include/site.h +++ b/include/site.h @@ -47,10 +47,6 @@ SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef SITE_H #define SITE_H /* diff --git a/include/swaprep.h b/include/swaprep.h index cd04164be..2c026c659 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef SWAPREP_H #define SWAPREP_H 1 diff --git a/include/swapreq.h b/include/swapreq.h index b8455086d..9c59bbf84 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef SWAPREQ_H #define SWAPREQ_H 1 diff --git a/include/validate.h b/include/validate.h index 7d30b94a9..467533d22 100644 --- a/include/validate.h +++ b/include/validate.h @@ -26,10 +26,6 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index e22e571e5..7c3fce092 100644 --- a/include/window.h +++ b/include/window.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 8e4b4e096..89e3ee10b 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H @@ -48,10 +48,6 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfb.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #if !defined(_MFB_H_) || defined(MFB_PROTOTYPES_ONLY) #ifndef MFB_PROTOTYPES_ONLY #define _MFB_H_ @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef MI_H #define MI_H #include <X11/X.h> diff --git a/mi/mibank.h b/mi/mibank.h index fb44ccc9b..cf27d1fae 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -22,10 +22,6 @@ /* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibstore.h b/mi/mibstore.h index 366757f76..fb58975c6 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -18,10 +18,6 @@ /* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/micmap.h b/mi/micmap.h index df5f6dc9a..ca2a417be 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,9 +1,5 @@ /* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include "colormapst.h" #ifndef _MICMAP_H_ diff --git a/mi/micoord.h b/mi/micoord.h index 9521fe0fe..e4b242475 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -26,10 +26,6 @@ * */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _MICOORD_H_ #define _MICOORD_H_ 1 diff --git a/mi/mifillarc.h b/mi/mifillarc.h index 52ea00272..ff39bac1d 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -27,10 +27,6 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ diff --git a/mi/mifpoly.h b/mi/mifpoly.h index a1521c656..79f606b4d 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/miline.h b/mi/miline.h index a856038f5..f52a51ebd 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -27,10 +27,6 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef MILINE_H #include "screenint.h" diff --git a/mi/mipointer.h b/mi/mipointer.h index 747954893..f8e7fd084 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -31,10 +31,6 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index b4dd2f604..682f8ac88 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -31,10 +31,6 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mistruct.h b/mi/mistruct.h index 36a810703..98879b72d 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -47,10 +47,6 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/miwideline.h b/mi/miwideline.h index cdfe624db..96d6aae86 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -30,10 +30,6 @@ from The Open Group. /* Author: Keith Packard, MIT X Consortium */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include "mispans.h" #include "mifpoly.h" /* for ICEIL */ diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index 3d50b5a84..85b2604f5 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -22,10 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _SHADOW_H_ #define _SHADOW_H_ diff --git a/render/glyphstr.h b/render/glyphstr.h index f582343d9..f4777a248 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -23,10 +23,6 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ diff --git a/render/mipict.h b/render/mipict.h index c15d1e1c5..e6e8b70fa 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -23,10 +23,6 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _MIPICT_H_ #define _MIPICT_H_ diff --git a/render/picture.h b/render/picture.h index e04790374..b09d9aac2 100644 --- a/render/picture.h +++ b/render/picture.h @@ -23,10 +23,6 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _PICTURE_H_ #define _PICTURE_H_ diff --git a/render/picturestr.h b/render/picturestr.h index 681bd9663..58b840c6d 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -23,10 +23,6 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _PICTURESTR_H_ #define _PICTURESTR_H_ diff --git a/render/renderedge.h b/render/renderedge.h index 20eeacc47..d621d9dcf 100644 --- a/render/renderedge.h +++ b/render/renderedge.h @@ -22,10 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #ifndef _RENDEREDGE_H_ #define _RENDEREDGE_H_ |