XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: common: drop ifdef HAVE_XORG_CONFIG_H

Browse Source 
Not really needed, because <xorg-config.h> is always present anyways.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-29 18:01:16 +01:00
committed by Enrico Weigelt
parent f7e5867927
commit 73dd3a470f
35 changed files with 2 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/modeline2c.awk
View File

@@ -52,9 +52,7 @@ BEGIN {
print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>"
print " */"
print ""
print "#ifdef HAVE_XORG_CONFIG_H"
print "#include <xorg-config.h>"
print "#endif"
print ""
print "#include \"xf86.h\""
print "#include \"xf86Config.h\""

8
hw/xfree86/common/xf86.h
View File

@@ -35,19 +35,11 @@
#ifndef _XF86_H
#define _XF86_H
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#elif HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "xf86str.h"
#include "xf86Opt.h"
#include <X11/Xfuncproto.h>
#include <stdarg.h>
#ifdef RANDR
#include <X11/extensions/randr.h>
#endif
/* General parameters */
extern _X_EXPORT Bool xorgHWAccess;

3
hw/xfree86/common/xf86AutoConfig.c
View File

@@ -28,10 +28,7 @@
*
* Author: David Dawes <dawes@XFree86.Org>.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "os/osdep.h"

3
hw/xfree86/common/xf86Bus.c
View File

@@ -28,10 +28,7 @@
/*
* This file contains the interfaces to the bus-specific code
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <ctype.h>
#include <stdlib.h>

6
hw/xfree86/common/xf86Bus.h
View File

@@ -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 <xorg-config.h>
#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 */

3
hw/xfree86/common/xf86Config.c
View File

@@ -41,10 +41,7 @@
* Egbert Eich <eich@XFree86.Org>
* ... and others
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <sys/stat.h>
#include <sys/types.h>

5
hw/xfree86/common/xf86Config.h
View File

@@ -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 <xorg-config.h>
#endif
#include "xf86Optrec.h"
#include "xf86Parser.h"
#include "xf86str.h"

3
hw/xfree86/common/xf86Configure.c
View File

@@ -22,10 +22,7 @@
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <errno.h>

3
hw/xfree86/common/xf86Cursor.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>
#include <X11/Xmd.h>

3
hw/xfree86/common/xf86DGA.c
View File

@@ -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 <xorg-config.h>
#endif
#include <string.h>
#include <X11/X.h>

4
hw/xfree86/common/xf86DPMS.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>
#include "os.h"

3
hw/xfree86/common/xf86Events.c
View File

@@ -48,10 +48,7 @@
*/
/* [JCH-96/01/21] Extended std reverse map to four buttons. */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <errno.h>
#include <X11/X.h>

3
hw/xfree86/common/xf86Extensions.c
View File

@@ -22,10 +22,7 @@
*
* Author: Daniel Stone <daniel@fooishbar.org>
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "extension.h"
#include "globals.h"

4
hw/xfree86/common/xf86Globals.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>
#include "os.h"

3
hw/xfree86/common/xf86Helper.c
View File

@@ -33,10 +33,7 @@
* This file includes the helper functions that the server provides for
* different drivers.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <sys/stat.h>
#include <X11/X.h>

5
hw/xfree86/common/xf86InPriv.h
View File

@@ -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 <xorg-config.h>
#endif
/* xf86Globals.c */
extern InputDriverPtr *xf86InputDriverList;
extern int xf86NumInputDrivers;

3
hw/xfree86/common/xf86Init.c
View File

@@ -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 <xorg-config.h>
#endif
#include <stdlib.h>
#include <errno.h>

3
hw/xfree86/common/xf86Mode.c
View File

@@ -79,10 +79,7 @@
*
* This file includes helper functions for mode related things.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <X11/X.h>

3
hw/xfree86/common/xf86Option.c
View File

@@ -30,10 +30,7 @@
*
* This file includes public option handling functions.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <stdlib.h>
#include <ctype.h>

3
hw/xfree86/common/xf86PM.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>

3
hw/xfree86/common/xf86RandR.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>

5
hw/xfree86/common/xf86VGAarbiterPriv.h
View File

@@ -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 <xorg-config.h>
#endif
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"

3
hw/xfree86/common/xf86VidMode.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>

3
hw/xfree86/common/xf86Xinput.c
View File

@@ -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 <xorg-config.h>
#endif
#include <string.h> /* InputClassMatches */
#include <X11/Xfuncproto.h>

3
hw/xfree86/common/xf86cmap.c
View File

@@ -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 <xorg-config.h>
#endif
#include <math.h>
#include <X11/X.h>

3
hw/xfree86/common/xf86fbBus.c
View File

@@ -28,10 +28,7 @@
/*
* This file contains the interfaces to the bus-specific code
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <ctype.h>
#include <stdlib.h>

3
hw/xfree86/common/xf86noBus.c
View File

@@ -28,10 +28,7 @@
/*
* This file contains the interfaces to the bus-specific code
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <ctype.h>
#include <stdlib.h>

3
hw/xfree86/common/xf86pciBus.c
View File

@@ -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 <xorg-config.h>
#endif
#include <ctype.h>
#include <dirent.h>

6
hw/xfree86/common/xf86pciBus.h
View File

@@ -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 <xorg-config.h>
#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 */

3
hw/xfree86/common/xf86platformBus.c
View File

@@ -25,10 +25,7 @@
/*
* This file contains the interfaces to the bus-specific code
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#ifdef XSERVER_PLATFORM_BUS
#include <errno.h>

3
hw/xfree86/common/xf86sbusBus.c
View File

@@ -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 <xorg-config.h>
#endif
#include <ctype.h>
#include <stdio.h>

3
hw/xfree86/common/xf86xv.c
View File

@@ -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 <xorg-config.h>
#endif
#include <X11/X.h>
#include <X11/Xproto.h>

4
hw/xfree86/common/xf86xvmc.c
View File

@@ -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 <xorg-config.h>
#endif
#include "misc.h"
#include "xf86.h"

24
hw/xfree86/common/xisb.c
View File

@@ -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 <xorg-config.h>
#endif
#include <misc.h>
#include <xf86.h>
@@ -45,22 +37,6 @@
#include <xf86Xinput.h>
#include "xisb.h"
/*****************************************************************************
* Local Headers
****************************************************************************/
/*****************************************************************************
* Variables without includable headers
****************************************************************************/
/*****************************************************************************
* Local Variables
****************************************************************************/
/*****************************************************************************
* Function Definitions
****************************************************************************/
XISBuffer *
XisbNew(int fd, ssize_t size)
{

3
hw/xfree86/common/xorgHelper.c
View File

@@ -1,7 +1,4 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <X11/X.h>
#include "os.h"