diff --git a/hw/xfree86/common/modeline2c.awk b/hw/xfree86/common/modeline2c.awk index 4900d5a44f..878ff0fde2 100644 --- a/hw/xfree86/common/modeline2c.awk +++ b/hw/xfree86/common/modeline2c.awk @@ -52,9 +52,7 @@ BEGIN { print " * Based on Perl script from Dirk Hohndel " print " */" print "" - print "#ifdef HAVE_XORG_CONFIG_H" print "#include " - print "#endif" print "" print "#include \"xf86.h\"" print "#include \"xf86Config.h\"" diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index fafbb9ecbb..0605c8459b 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -35,19 +35,11 @@ #ifndef _XF86_H #define _XF86_H -#ifdef HAVE_XORG_CONFIG_H -#include -#elif HAVE_DIX_CONFIG_H -#include -#endif - #include "xf86str.h" #include "xf86Opt.h" #include #include -#ifdef RANDR #include -#endif /* General parameters */ extern _X_EXPORT Bool xorgHWAccess; diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 7890a4ff3f..7142c683d6 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -28,10 +28,7 @@ * * Author: David Dawes . */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include "os/osdep.h" diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 0d19a4b570..89871c19e1 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -28,10 +28,7 @@ /* * This file contains the interfaces to the bus-specific code */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index 6bec9fa7d9..8fa883ed86 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -30,14 +30,9 @@ * Everything contained here is private to xf86Bus.c. In particular the * video drivers must not include this file. */ - #ifndef _XF86_BUS_H #define _XF86_BUS_H -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - #include "xf86pciBus.h" #if defined(__sparc__) || defined(__sparc) #include "xf86sbusBus.h" @@ -84,4 +79,5 @@ void xf86RemoveDevFromEntity(int entityIndex, GDevPtr dev); Bool xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only); Bool xf86CheckSlot(const void *ptr, BusType type); + #endif /* _XF86_BUS_H */ diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 8dce643fbb..cb4fecf947 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -41,10 +41,7 @@ * Egbert Eich * ... and others */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index f467f55e53..7618cfb6de 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -24,14 +24,9 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - #ifndef _xf86_config_h #define _xf86_config_h -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - #include "xf86Optrec.h" #include "xf86Parser.h" #include "xf86str.h" diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 5d716acaef..9d1d333fb9 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -22,10 +22,7 @@ * Author: Alan Hourihane, alanh@fairlite.demon.co.uk * */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 7a90414945..d67e9da90f 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -24,10 +24,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index afda00a87b..e06f2ab6c4 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -36,10 +36,7 @@ * someone actually cares about DGA, it'd be nice to clean this up. But trust * me, I am not that person. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index e0eed3b4cb..4f36964163 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -24,14 +24,10 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - /* * This file contains the DPMS functions required by the extension. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include "os.h" diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 0340ea203c..4bf730959f 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -48,10 +48,7 @@ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c index cfd2f242b8..74bf218b94 100644 --- a/hw/xfree86/common/xf86Extensions.c +++ b/hw/xfree86/common/xf86Extensions.c @@ -22,10 +22,7 @@ * * Author: Daniel Stone */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include "extension.h" #include "globals.h" diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 0a2e035af2..336e0897fc 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -25,14 +25,10 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - /* * This file contains all the XFree86 global variables. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include "os.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 382e601321..f5f09825df 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -33,10 +33,7 @@ * This file includes the helper functions that the server provides for * different drivers. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 3a84a5d79d..774b10b274 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -24,14 +24,9 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - #ifndef _xf86InPriv_h #define _xf86InPriv_h -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - /* xf86Globals.c */ extern InputDriverPtr *xf86InputDriverList; extern int xf86NumInputDrivers; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 557f357d56..68c49f0439 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -29,10 +29,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index a727021d03..313ec6f53b 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -79,10 +79,7 @@ * * This file includes helper functions for mode related things. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 42d33a3f91..75618afa8a 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -30,10 +30,7 @@ * * This file includes public option handling functions. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index c73fcebd2f..59a14862e4 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -24,10 +24,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index baead10be6..3f032da577 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -20,10 +20,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h index 55857fa969..2b1385dad1 100644 --- a/hw/xfree86/common/xf86VGAarbiterPriv.h +++ b/hw/xfree86/common/xf86VGAarbiterPriv.h @@ -23,14 +23,9 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ - #ifndef XSERVER_XFREE86_XF86VGAARBITERPRIV_H #define XSERVER_XFREE86_XF86VGAARBITERPRIV_H -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - #include "misc.h" #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 3fd148f5a3..c348651a5f 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -33,10 +33,7 @@ * so that two version of code that do similar things don't have to be * maintained. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 766d1ae49f..cebfc5d01a 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -45,10 +45,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include /* InputClassMatches */ #include diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index a0cfeefd65..6235e466db 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -24,10 +24,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 7dbd5ac2c0..8abbff2b7e 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -28,10 +28,7 @@ /* * This file contains the interfaces to the bus-specific code */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index e10d2fe09d..b8d1f08af9 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -28,10 +28,7 @@ /* * This file contains the interfaces to the bus-specific code */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index beed76635b..d13d15ad6c 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -24,13 +24,10 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - /* * This file contains the interfaces to the bus-specific code */ -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index 41557c09ba..5f2522a73f 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -24,14 +24,9 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - #ifndef _XF86_PCI_BUS_H #define _XF86_PCI_BUS_H -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - #include "xf86MatchDrivers.h" void xf86PciProbe(void); @@ -53,4 +48,5 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip, XF86MatchedDrivers *md); void xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md); + #endif /* _XF86_PCI_BUS_H */ diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 762dadd3b3..6ef72c9e8d 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -25,10 +25,7 @@ /* * This file contains the interfaces to the bus-specific code */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #ifdef XSERVER_PLATFORM_BUS #include diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index c31edd4c4e..1fa9a3f9fc 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,10 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 56ea4d2eee..a4b42c05ac 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -27,10 +27,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 69c3685b95..27963899bb 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2001-2003 by The XFree86 Project, Inc. * @@ -25,10 +24,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index ff52a2c936..5d7b31c2e4 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,19 +24,11 @@ * in this Software without prior written authorization from Metro Link. * */ - /* X Input Serial Buffer routines for use in any XInput driver that accesses a serial device. */ - -/***************************************************************************** - * Standard Headers - ****************************************************************************/ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include @@ -45,22 +37,6 @@ #include #include "xisb.h" -/***************************************************************************** - * Local Headers - ****************************************************************************/ - -/***************************************************************************** - * Variables without includable headers - ****************************************************************************/ - -/***************************************************************************** - * Local Variables - ****************************************************************************/ - -/***************************************************************************** - * Function Definitions - ****************************************************************************/ - XISBuffer * XisbNew(int fd, ssize_t size) { diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index 174ca6bb7a..4041d795c1 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,7 +1,4 @@ - -#ifdef HAVE_XORG_CONFIG_H #include -#endif #include #include "os.h"