diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
| commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
| tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /hw | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'hw')
489 files changed, 2009 insertions, 61 deletions
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 1731b92cd..57673d746 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -43,6 +43,10 @@ * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 171d306c3..4ce736bf8 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -42,7 +42,7 @@ #include "dmxfont.h" #include "dmxlog.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfont.h" #include "dixstruct.h" diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h index 9912db65c..f69aac196 100644 --- a/hw/dmx/dmxfont.h +++ b/hw/dmx/dmxfont.h @@ -38,7 +38,7 @@ #ifndef DMXFONT_H #define DMXFONT_H -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> /** Font private area. */ typedef struct _dmxFontPriv { diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index d37f5b0f0..8b3e303d7 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -50,6 +50,10 @@ /* $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 b7d813329..86f237675 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -50,6 +50,10 @@ /* $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 e60aa4e83..164678ec2 100644 --- a/hw/xfree86/common/fourcc.h +++ b/hw/xfree86/common/fourcc.h @@ -34,6 +34,10 @@ 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/scoasm.h b/hw/xfree86/common/scoasm.h index dbf8c8f86..a8baea6c2 100644 --- a/hw/xfree86/common/scoasm.h +++ b/hw/xfree86/common/scoasm.h @@ -31,6 +31,10 @@ * scoasm.h - used to define inline versions of certain functions which * do NOT appear in sys/inline.h. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef SCO325 #ifndef _SCOASM_HDR_INC #define _SCOASM_HDR_INC diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 1885eaa72..8d74fc808 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -34,6 +34,10 @@ * "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/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 5f4886724..28b6ca68e 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -33,6 +33,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Parser.h" #include "xf86tokens.h" diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 903f61c28..a4779d0d9 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -31,6 +31,10 @@ * 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> #include <unistd.h> diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index fbeca7f9c..96da6e6a9 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -33,6 +33,10 @@ * video drivers must not include this file. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_BUS_H #define _XF86_BUS_H diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 269923c29..af27d9531 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -46,6 +46,10 @@ * ... and others */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XF86DRI #include <sys/types.h> #include <grp.h> diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index e54da3d09..77b25ed32 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86_config_h #define _xf86_config_h diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index d35f0c8d7..b77d53038 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index f5f969060..0e2d77492 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -29,6 +29,10 @@ /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 3d9bdfe22..4e47f2eee 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -29,6 +29,10 @@ * Written by Mark Vojkovich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 50a3e66d2..535c7e8fa 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -32,6 +32,10 @@ * 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 <X11/os.h> #include "globals.h" diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 15aafb817..4b65d2c1f 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_DATE #define XF86_DATE "18 December 2003" diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 76b69d79b..a41d0dd75 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 1d6d332ec..a39d0a212 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -9,6 +9,10 @@ * Author: Dirk Hohndel <hohndel@XFree86.Org> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index f34d19a32..3208e6da8 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -31,6 +31,10 @@ * Load the driver modules and call their probe functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index fe07d2875..c9c8128b2 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -31,6 +31,10 @@ * Call the functions from the scanpci module. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index a40c91b0f..90beb5688 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -53,6 +53,10 @@ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 653b4433c..c6488d677 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -31,6 +31,10 @@ * This file contains all the XFree86 global variables. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "windowstr.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 50466697b..04f0d0150 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -36,6 +36,10 @@ * different drivers. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 32e3c8e1d..4a02606d3 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86InPriv_h #define _xf86InPriv_h diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 5db7f1a36..d4f4dd486 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -32,6 +32,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdlib.h> #undef HAS_UTSNAME diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index 338e28297..606084d41 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -52,6 +52,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "inputstr.h" diff --git a/hw/xfree86/common/xf86Kbd.c b/hw/xfree86/common/xf86Kbd.c index e1bbe8388..85f9e3406 100644 --- a/hw/xfree86/common/xf86Kbd.c +++ b/hw/xfree86/common/xf86Kbd.c @@ -50,6 +50,10 @@ /* $XConsortium: xf86Kbd.c /main/10 1996/02/21 17:38:32 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86KbdBSD.c b/hw/xfree86/common/xf86KbdBSD.c index 3c6c0eece..c1f6156e3 100644 --- a/hw/xfree86/common/xf86KbdBSD.c +++ b/hw/xfree86/common/xf86KbdBSD.c @@ -51,6 +51,10 @@ /* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86KbdLnx.c b/hw/xfree86/common/xf86KbdLnx.c index f6e9200c9..81e9122e7 100644 --- a/hw/xfree86/common/xf86KbdLnx.c +++ b/hw/xfree86/common/xf86KbdLnx.c @@ -57,6 +57,10 @@ /* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 0dc4b6fca..89c23c24a 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -37,6 +37,10 @@ */ /* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86Keymap.h b/hw/xfree86/common/xf86Keymap.h index 82ea52eef..f0998ba9b 100644 --- a/hw/xfree86/common/xf86Keymap.h +++ b/hw/xfree86/common/xf86Keymap.h @@ -36,6 +36,10 @@ static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = { +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if !defined(__SOL8__) && (!defined(sun) || defined(i386)) /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol, diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index d59bea0c8..75a1d71fc 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -31,6 +31,10 @@ * XFree86-Misc extension. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 6209290df..0211e3ced 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -36,6 +36,10 @@ * This file includes helper functions for mode related things. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 7f4179cc3..7e11e776f 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -40,6 +40,10 @@ * 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 718732353..d207ec0a9 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -29,6 +29,10 @@ /* 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/xf86Option.c b/hw/xfree86/common/xf86Option.c index ae131aa7c..695d97707 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -32,6 +32,10 @@ * This file includes public option handling functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdlib.h> #include <ctype.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index a307bebb0..0262be3df 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index ab8836bd6..12cf3dd62 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -47,6 +47,10 @@ */ +#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 8b0a4323b..01257fd9b 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -34,6 +34,10 @@ * "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 93d64fd51..cbec1ade7 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -32,6 +32,10 @@ * 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/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 7c77777e4..a020e97b2 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "mibank.h" diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index ce2c62bb3..6ba347f34 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -27,6 +27,10 @@ * 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 45746bc90..f0652fcb0 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -28,6 +28,10 @@ * 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/xf86Versions.c b/hw/xfree86/common/xf86Versions.c index 7b20ef9ab..6de7d53c2 100644 --- a/hw/xfree86/common/xf86Versions.c +++ b/hw/xfree86/common/xf86Versions.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86OSmouse.h" #include "xf86OSKbd.h" diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 1b2b63bbf..ec371f299 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -35,6 +35,10 @@ * maintained. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index ab13ebd0f..68be17c3a 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -53,6 +53,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index e9f9fae3e..0d1f98844 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -50,6 +50,10 @@ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 1.4 2005/04/20 12:25:21 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xfuncproto.h> #include <X11/Xmd.h> #ifdef XINPUT diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 0c20f78fe..e45fd0f4d 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -51,6 +51,10 @@ /* $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.c b/hw/xfree86/common/xf86cmap.c index e27dceee9..019d84287 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) #include <math.h> diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index 4291b971a..25e17e54c 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -27,6 +27,10 @@ * 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/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 0d448e27b..bceca0dd8 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -31,6 +31,10 @@ * 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> #include <unistd.h> diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index fef4d633c..3228c9bdf 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index adb26a1f1..3ea0248bf 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -27,6 +27,10 @@ * 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/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 56a79ac23..97d5c3f53 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -31,6 +31,10 @@ * 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> #include <unistd.h> diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 904de01d6..70cdf1cc0 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -31,6 +31,10 @@ * 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> #include <unistd.h> diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index da732e0a5..f01c7add8 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -31,6 +31,10 @@ */ #define INCLUDE_DEPRECATED 1 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index fbb733ae7..75d82fbcf 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_PCI_BUS_H #define _XF86_PCI_BUS_H diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 5b747e248..ae4688737 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdio.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 81c1b84ac..39688e569 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -22,6 +22,10 @@ */ /* $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 67052b220..186959708 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -32,6 +32,10 @@ * 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.c b/hw/xfree86/common/xf86xv.c index 79cda35c5..0c8b39a70 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -30,6 +30,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index 316d6c9e5..258848b24 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -27,6 +27,10 @@ * 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.c b/hw/xfree86/common/xf86xvmc.c index f6d0aaf39..bad2233e2 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index 0b073aac8..97eef7093 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -27,6 +27,10 @@ * 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 0d1efdafb..7b0b5376d 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -27,6 +27,10 @@ * 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.c b/hw/xfree86/common/xisb.c index 33fedeb0f..4ffc3ede4 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -36,6 +36,10 @@ * Standard Headers ****************************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 39ae2ee11..1e917a138 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -26,6 +26,10 @@ */ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index af729a01f..3eed90a11 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,5 +1,9 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index 47005320a..de7f6f6b2 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -27,6 +27,10 @@ * 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/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 577e8169a..a3d7068ec 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -5,6 +5,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" /* #include "xf86_ansic.h" */ diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index b17363648..a6c05bfe2 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -7,6 +7,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index f7e7a76ba..a14b48284 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -10,6 +10,10 @@ * 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/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index a2437a4ba..36983f452 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -4,6 +4,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index a499db1da..c21bac17a 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xarch.h> #include "xf86DDC.h" #include "vdif.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 391f220cd..e23256bcc 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -4,6 +4,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index 8329e129a..6c890c210 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "vdif.h" #include <X11/misc.h> #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 5c129aef0..002cebba8 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,5 +1,9 @@ /* $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.c b/hw/xfree86/ddc/xf86DDC.c index 3490fd533..b323f6b22 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -4,6 +4,10 @@ * * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 3d94fd976..c6ded82a1 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -11,6 +11,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_DDC_H # define XF86_DDC_H diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c index 9369db1f2..666ce52ce 100644 --- a/hw/xfree86/dixmods/GLcoremodule.c +++ b/hw/xfree86/dixmods/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(GLcoreSetup); @@ -42,7 +46,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_EXTENSION, ABI_EXTENSION_VERSION, diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c index 7920aa9bd..74dca9a26 100644 --- a/hw/xfree86/dixmods/afbmodule.c +++ b/hw/xfree86/dixmods/afbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/bitmapmod.c b/hw/xfree86/dixmods/bitmapmod.c index 5141fd80a..0ae9ff7ad 100644 --- a/hw/xfree86/dixmods/bitmapmod.c +++ b/hw/xfree86/dixmods/bitmapmod.c @@ -25,9 +25,13 @@ */ /* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.7 1999/01/26 05:53:47 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xdefs.h> -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(bitmapSetup); diff --git a/hw/xfree86/dixmods/cfb16module.c b/hw/xfree86/dixmods/cfb16module.c index ef5c79459..7dcf52625 100644 --- a/hw/xfree86/dixmods/cfb16module.c +++ b/hw/xfree86/dixmods/cfb16module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfb24module.c b/hw/xfree86/dixmods/cfb24module.c index e7e683ae0..c467db703 100644 --- a/hw/xfree86/dixmods/cfb24module.c +++ b/hw/xfree86/dixmods/cfb24module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c index 2d75763b0..619586320 100644 --- a/hw/xfree86/dixmods/cfb32module.c +++ b/hw/xfree86/dixmods/cfb32module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c index 142442adb..f2cd87e59 100644 --- a/hw/xfree86/dixmods/cfbmodule.c +++ b/hw/xfree86/dixmods/cfbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index ff2b7ffbc..218b28cec 100644 --- a/hw/xfree86/dixmods/dbemodule.c +++ b/hw/xfree86/dixmods/dbemodule.c @@ -1,5 +1,13 @@ /* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(dbeSetup); diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index eb9791098..06c55e009 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,5 +1,9 @@ /* $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/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index b4e9a1e94..88d3f6c2e 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index cb58e7fb9..3e185e460 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.3 2005/04/20 12:25:13 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef INITARGS #define INITARGS void #endif diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 99bac9dac..918d1e4df 100644 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h @@ -2,6 +2,10 @@ /* Prototypes for DGA functions that the DDX must provide */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _VIDMODEPROC_H_ #define _VIDMODEPROC_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index efa7d1b40..1fdead0bc 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -9,6 +9,10 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 7224a5eee..990d71da2 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -8,6 +8,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h index a823e28f2..16fc4c8b2 100644 --- a/hw/xfree86/dixmods/extmod/xf86dgaext.h +++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86DGAEXT_H_ #define _XF86DGAEXT_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index e5ce56fc4..8c0f481b1 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -8,6 +8,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 3dab4277a..87a251767 100644 --- a/hw/xfree86/dixmods/extmod/xf86miscproc.h +++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h @@ -2,6 +2,10 @@ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86MISCPROC_H_ #define _XF86MISCPROC_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 99de107c4..005c96102 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -35,6 +35,10 @@ from Kaleb S. KEITHLEY #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 0ffca8397..9f15129c3 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "scrnintstr.h" diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index e08aef7f9..b284e3f4e 100644 --- a/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xvmcext.h" extern int (*XvGetScreenIndexProc)(void); diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c index 1b9b665dd..50cce798c 100644 --- a/hw/xfree86/dixmods/fbmodule.c +++ b/hw/xfree86/dixmods/fbmodule.c @@ -25,6 +25,14 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbmodule.c,v 1.3 2000/02/14 19:20:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/ftmodule.c b/hw/xfree86/dixmods/ftmodule.c index 1f65cefbe..27b2bd2c3 100644 --- a/hw/xfree86/dixmods/ftmodule.c +++ b/hw/xfree86/dixmods/ftmodule.c @@ -27,7 +27,7 @@ #include "misc.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(freetypeSetup); diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index 49fa254cc..5bcd101aa 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -22,15 +22,23 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c index 40d884c9e..dc9fddc5b 100644 --- a/hw/xfree86/dixmods/mfbmodule.c +++ b/hw/xfree86/dixmods/mfbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index 4eebf0ee6..2825555c2 100644 --- a/hw/xfree86/dixmods/recordmod.c +++ b/hw/xfree86/dixmods/recordmod.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" extern Bool noTestExtensions; diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index 28f971a62..16ba6f2ce 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -22,15 +22,23 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c index 868de3de4..3e8547b50 100644 --- a/hw/xfree86/dixmods/type1mod.c +++ b/hw/xfree86/dixmods/type1mod.c @@ -27,7 +27,7 @@ #include "misc.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(type1Setup); diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index f6e37b54e..1783d577a 100644 --- a/hw/xfree86/dixmods/xf86XTrapModule.c +++ b/hw/xfree86/dixmods/xf86XTrapModule.c @@ -2,6 +2,10 @@ /* This is the xf86 module code for the DEC_XTRAP extension. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" #include <X11/extensions/xtrapdi.h> diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 094703bc0..7308b3d0e 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -34,6 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86.h" #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index bfb0d64a8..52acad959 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -34,6 +34,10 @@ 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/drimodule.c b/hw/xfree86/dri/drimodule.c index 1fa7a8edc..446ba6431 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -34,6 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(driSetup); diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index cf1b1eacf..47335ed04 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -32,6 +32,10 @@ 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 77c16e0ef..dd33c87a4 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -36,6 +36,10 @@ /* $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/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 3df025b0a..4a58b6c9e 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -35,6 +35,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86.h" #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index 5835446bf..ca27e43d1 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _DUMMY_LIB_H #define _DUMMY_LIB_H diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index e754a2013..7677fc055 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index 862f85b4e..4a578ca46 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 0ff83881b..fc560f10f 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 59424f20f..80804627e 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 90283ccb3..5deb56d70 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 383fa08a0..4676a93cf 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 006a6382a..fe21d5cab 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" resPtr diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 934f016df..05a9cca06 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 090827a05..4cd9de04c 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 8089a46da..2dcc2eccb 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 9fbe347e6..9fa9e803f 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 3dc3264c3..3a06b02d1 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index b417d3007..f9454cb73 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 8a48b5245..50d423d22 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index 9d0f6ecd7..61c1fe4d6 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 6a0e38239..192d29dec 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 9296cc72f..300311c89 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index 349443c9c..9a24455f4 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 0530e3b7a..d5a11ce65 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 148b8fb7e..017f0b37e 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 297606fc5..f6c5ed36e 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa.c +++ b/hw/xfree86/exa/exa.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa_accel.c +++ b/hw/xfree86/exa/exa_accel.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa_migration.c +++ b/hw/xfree86/exa/exa_migration.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 79ace00e1..8c4c51dec 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */ /* all driver need this */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc3fcdb6..584ad4db2 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,5 +1,9 @@ /* $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/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 7869bb31d..80bccc8db 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86cmap.h" #include "fbdevhw.h" diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index f4017fb2a..a18b84345 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -4,6 +4,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LINUX_FB_H #define _LINUX_FB_H diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 4253d8075..321c1e2e1 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -8,6 +8,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if 1 #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index 099406e8f..035d49a51 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -3,6 +3,10 @@ */ /* $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/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c index 0058795f0..7569af30e 100644 --- a/hw/xfree86/i2c/xf86i2cmodule.c +++ b/hw/xfree86/i2c/xf86i2cmodule.c @@ -7,6 +7,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(i2cSetup); diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 01bb4c30a..e9ddd3334 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index c3d47da2b..a9538f6e4 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -15,6 +15,10 @@ * on PIO. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index c0433773d..495a0e04d 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index 7c95171d4..f35bd7233 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -5,6 +5,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Pci.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index c54de2461..35b74cd42 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c index 2d0faa603..b9580a1de 100644 --- a/hw/xfree86/int10/x86emu.c +++ b/hw/xfree86/int10/x86emu.c @@ -1,4 +1,8 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef NO_SYS_HEADERS # include "xf86_ansic.h" #endif diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index e88c6500d..06cf40b8c 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -5,6 +5,10 @@ * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "compiler.h" diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 9e137df41..d88221a89 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -6,6 +6,10 @@ * 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/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c index 2bb49cb0c..391c18374 100644 --- a/hw/xfree86/int10/xf86int10module.c +++ b/hw/xfree86/int10/xf86int10module.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86Pci.h" diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index ffee4fb9a..c15a5f9be 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <x86emu.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index 27ff6fc14..a7eb6d3c7 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86X86EMU_H_ #define XF86X86EMU_H_ #include <x86emu.h> diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h index 3f60f37d7..6b8247119 100644 --- a/hw/xfree86/loader/aout.h +++ b/hw/xfree86/loader/aout.h @@ -32,6 +32,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AOUT_H #define _AOUT_H diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index a79375abc..a000862ae 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -25,6 +25,10 @@ * * Modified 21/02/97 by Sebastien Marineau to support OS/2 a.out objects */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h index 7aeaf41fe..f906816f7 100644 --- a/hw/xfree86/loader/aoutloader.h +++ b/hw/xfree86/loader/aoutloader.h @@ -21,6 +21,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AOUTLOADER_H #define _AOUTLOADER_H extern void *AOUTLoadModule(loaderPtr, int, LOOKUP **); diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h index 3129d1c72..c9ae558cf 100644 --- a/hw/xfree86/loader/ar.h +++ b/hw/xfree86/loader/ar.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AR_H #define _AR_H diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h index 54a8cb57f..b3cecdfbe 100644 --- a/hw/xfree86/loader/coff.h +++ b/hw/xfree86/loader/coff.h @@ -16,6 +16,10 @@ COFF, thein check out the book mentioned above. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _COFF_H #define _COFF_H diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index 366bf6eaf..32a229d2f 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -22,6 +22,10 @@ * 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 <sys/types.h> #include <unistd.h> #include <stdlib.h> diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h index 3d6728481..75cd542c8 100644 --- a/hw/xfree86/loader/coffloader.h +++ b/hw/xfree86/loader/coffloader.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _COFFLOADER_H #define _COFFLOADER_H /* coffloader.c */ diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index b1997cd40..4e57d2e15 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -51,6 +51,10 @@ */ #undef DBMALLOC +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "sym.h" #include "colormap.h" #include "cursor.h" diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index a089ba548..719b7b314 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -25,6 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <dlfcn.h> diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index 51f0520e6..1dfae274d 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -21,6 +21,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _DLLOADER_H #define _DLLOADER_H extern void *DLLoadModule(loaderPtr, int, LOOKUP **); diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h index 51322a9e7..c53796cb6 100644 --- a/hw/xfree86/loader/elf.h +++ b/hw/xfree86/loader/elf.h @@ -115,6 +115,10 @@ typedef struct dynamic64 { } d_un; } Elf64_Dyn; +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef QNX4 extern Elf32_Dyn _DYNAMIC[]; #endif diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index 173695006..0275aa037 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -23,6 +23,10 @@ * 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 <sys/types.h> #ifndef __UNIXOS2__ #include <sys/mman.h> diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h index 0a42d7060..6e9f02ca4 100644 --- a/hw/xfree86/loader/elfloader.h +++ b/hw/xfree86/loader/elfloader.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _ELFLOADER_H #define _ELFLOADER_H /* elfloader.c */ diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index f53da6e3a..0966466fd 100644 --- a/hw/xfree86/loader/extsym.c +++ b/hw/xfree86/loader/extsym.c @@ -25,6 +25,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "resource.h" #include "sym.h" #include <X11/misc.h> diff --git a/hw/xfree86/loader/fontsym.c b/hw/xfree86/loader/fontsym.c index 1a1324fdb..5daf82802 100644 --- a/hw/xfree86/loader/fontsym.c +++ b/hw/xfree86/loader/fontsym.c @@ -26,17 +26,21 @@ * authorization from the copyright holder(s) and author(s). */ -#include "font.h" +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#include <X11/fonts/font.h> #include "sym.h" -#include "fntfilst.h" -#include "fontenc.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontenc.h> #ifdef FONTENC_COMPATIBILITY -#include "fontencc.h" +#include <X11/fonts/fontencc.h> #endif -#include "fntfilio.h" -#include "fntfil.h" -#include "fontutil.h" -#include "fontxlfd.h" +#include <X11/fonts/fntfilio.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontxlfd.h> #ifdef FONTCACHE #define _FONTCACHE_SERVER_ #include "fontcache.h" diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index d424f0461..9cd4e6eb8 100644 --- a/hw/xfree86/loader/hash.c +++ b/hw/xfree86/loader/hash.c @@ -24,6 +24,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/os.h> #include <X11/Xos.h> #undef abs diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h index 88b525669..45617bd5f 100644 --- a/hw/xfree86/loader/hash.h +++ b/hw/xfree86/loader/hash.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _HASH_H #define _HASH_H diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 4e4729526..471510a30 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -48,6 +48,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <errno.h> #include <stdio.h> #include <stdlib.h> diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index f48aadb02..307b9bb48 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -49,6 +49,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LOADER_H #define _LOADER_H diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index d2779812f..72591a5df 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -49,12 +49,16 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LOADERPROCS_H #define _LOADERPROCS_H #define IN_LOADER #include "xf86Module.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> typedef struct module_desc { struct module_desc *child; diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index 705460eb9..fb0affeba 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -29,6 +29,10 @@ /* Maybe this file belongs elsewhere? */ #define LOADERDECLARATIONS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c index 69a16ac80..f9bbbfeb4 100644 --- a/hw/xfree86/loader/loadfont.c +++ b/hw/xfree86/loader/loadfont.c @@ -29,6 +29,10 @@ /* Maybe this file belongs in lib/font/fontfile/module/ ? */ #define LOADERDECLARATIONS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index b3c9f736b..48220719b 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -49,6 +49,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/os.h> /* For stat() and related stuff */ #define NO_OSLIB_PROTOTYPES diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index 5977546b8..29d6a2f89 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -51,6 +51,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "sym.h" #include <X11/misc.h> #include "mi.h" diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 49f9c0d84..010730586 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" /* diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h index 0e18959c3..5b34718d6 100644 --- a/hw/xfree86/loader/sym.h +++ b/hw/xfree86/loader/sym.h @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _SYM_H #define _SYM_H diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index ee71f4ff8..de7e638bb 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -51,6 +51,10 @@ #define INCLUDE_DEPRECATED 1 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <setjmp.h> #include "sym.h" diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index 191c7e49e..1cf84353b 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,4 +1,8 @@ /* $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/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 5b7b35b40..0ed261061 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index b52b85425..98fb8f993 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -59,6 +59,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 5ac2e08b5..d38230a83 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -2,6 +2,10 @@ /* Resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index fcff3d6e7..d225c1f38 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -8,6 +8,10 @@ * and from xf86KbdCODrv.c by Holger Veit */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 3c3170fe1..d97782dc6 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -25,6 +25,10 @@ */ /* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index ef442b4f7..3554edddc 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 77a2a79a8..8328e5115 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,5 +1,9 @@ /* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index a46c616da..62952a343 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 02e7825b4..3cdea419b 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -25,6 +25,10 @@ */ /* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index e44629f89..817749988 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_io.c /main/11 1996/10/19 18:06:07 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 71bc91687..acd9fc111 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <unistd.h> #include <string.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 4cf2fbaae..461646c4a 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -10,6 +10,10 @@ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index 74345654b..ecaf78028 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 07cc55f54..06544eedf 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -28,6 +28,10 @@ */ /* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index a830b60c0..daf48fbc0 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 54b4c8848..1515d0e1e 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index bb84e5566..0ac1a63bc 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index f75418964..2306d2f58 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <sys/types.h> diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index 8c1a8b8a2..feff9779a 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index 9338e61d4..f909ee691 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <ctype.h> #include <err.h> diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 99be9ea2f..0f4b270f4 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -3,7 +3,11 @@ * * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _MEMRANGE_H #define _MEMRANGE_H diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index e2550bf86..edcb20c1b 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index f73c30182..d9dfcca31 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -27,6 +27,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bus/460gxPCI.c b/hw/xfree86/os-support/bus/460gxPCI.c index 9855b8b41..255dfa12f 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.c +++ b/hw/xfree86/os-support/bus/460gxPCI.c @@ -29,6 +29,10 @@ * This file contains the glue necessary for support of Intel's 460GX chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "460gxPCI.h" #include "xf86.h" #include "Pci.h" diff --git a/hw/xfree86/os-support/bus/460gxPCI.h b/hw/xfree86/os-support/bus/460gxPCI.h index 9459705d0..65a19b2f0 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.h +++ b/hw/xfree86/os-support/bus/460gxPCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_460GX_H #define PCI_460GX_H 1 diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index c1c08569e..d837ec92e 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -195,6 +195,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <errno.h> #include <signal.h> #include <X11/Xarch.h> diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 4a6ff672a..ee6e9d723 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -101,6 +101,10 @@ * This file has the private Pci definitions. The public ones are imported * from xf86Pci.h. Drivers should not use this file. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _PCI_H #define _PCI_H 1 diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index efe5c4ba6..168bc669e 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <stdio.h> #include <unistd.h> diff --git a/hw/xfree86/os-support/bus/altixPCI.c b/hw/xfree86/os-support/bus/altixPCI.c index c2c21d39f..010f6619a 100644 --- a/hw/xfree86/os-support/bus/altixPCI.c +++ b/hw/xfree86/os-support/bus/altixPCI.c @@ -1,6 +1,10 @@ /* * This file contains the glue necessary for support of SGI's Altix chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <unistd.h> #include "altixPCI.h" diff --git a/hw/xfree86/os-support/bus/altixPCI.h b/hw/xfree86/os-support/bus/altixPCI.h index 1d449d55b..2a738f362 100644 --- a/hw/xfree86/os-support/bus/altixPCI.h +++ b/hw/xfree86/os-support/bus/altixPCI.h @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_ALTIX_H #define PCI_ALTIX_H 1 diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 04ff8b956..08c7fbd39 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/e8870PCI.c b/hw/xfree86/os-support/bus/e8870PCI.c index 9eb34a67a..65b0c0474 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.c +++ b/hw/xfree86/os-support/bus/e8870PCI.c @@ -29,6 +29,10 @@ * This file contains the glue necessary for support of Intel's E8870 chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "e8870PCI.h" #include "xf86.h" #include "Pci.h" diff --git a/hw/xfree86/os-support/bus/e8870PCI.h b/hw/xfree86/os-support/bus/e8870PCI.h index 2d16077ac..9efa0ed6d 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.h +++ b/hw/xfree86/os-support/bus/e8870PCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_E8870_H #define PCI_E8870_H 1 diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index c3e621daf..f6d6f8a6d 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.5 2002/08/27 22:07:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" @@ -84,7 +88,7 @@ static pciBusInfo_t freebsdPci0 = { /* bridge */ NULL }; -#if !defined(__OpenBSD__) +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) #if X_BYTE_ORDER == X_BIG_ENDIAN #ifdef __sparc__ #ifndef ASI_PL diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c index 99e3ba245..6e2b650d1 100644 --- a/hw/xfree86/os-support/bus/ix86Pci.c +++ b/hw/xfree86/os-support/bus/ix86Pci.c @@ -136,6 +136,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 32e11e4eb..2a21aa3ea 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/netbsdPci.c b/hw/xfree86/os-support/bus/netbsdPci.c index 9c46ee3d3..7dbbfdec7 100644 --- a/hw/xfree86/os-support/bus/netbsdPci.c +++ b/hw/xfree86/os-support/bus/netbsdPci.c @@ -27,6 +27,10 @@ * authorization from the XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/mman.h> #include <sys/ioctl.h> diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 1be10ab9b..7a438af67 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -58,6 +58,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c index 2ada6fd47..48e10ede4 100644 --- a/hw/xfree86/os-support/bus/sparcPci.c +++ b/hw/xfree86/os-support/bus/sparcPci.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index d1284dc44..f0ab4307a 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -102,6 +102,10 @@ * 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/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 1ff4432b4..21b05cba4 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_SBUS_H #define _XF86_SBUS_H diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c index 16f1b40a5..3d219c86f 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.c +++ b/hw/xfree86/os-support/bus/zx1PCI.c @@ -31,6 +31,10 @@ * architectures. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "zx1PCI.h" #include "xf86.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bus/zx1PCI.h b/hw/xfree86/os-support/bus/zx1PCI.h index f46a68a30..2795b4459 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.h +++ b/hw/xfree86/os-support/bus/zx1PCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_ZX1_H #define PCI_ZX1_H 1 diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c index 8be822445..fd751e756 100644 --- a/hw/xfree86/os-support/drm/drmmodule.c +++ b/hw/xfree86/os-support/drm/drmmodule.c @@ -25,10 +25,14 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(drmSetup); @@ -39,7 +43,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_EXTENSION, ABI_EXTENSION_VERSION, diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h index 77d2f4db9..56e10cf67 100644 --- a/hw/xfree86/os-support/int10Defines.h +++ b/hw/xfree86/os-support/int10Defines.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _INT10DEFINES_H_ #define _INT10DEFINES_H_ 1 diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index b01004931..b8e821cd1 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -3,6 +3,10 @@ * linux specific part of the int10 module * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index dcde018ca..e99cde8da 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index c3ccef280..68ad34011 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,5 +1,9 @@ /* $XFree86: Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef LNX_H_ # ifdef __alpha__ extern unsigned long _bus_base __P ((void)) __attribute__ ((const)); diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 3b29618aa..690d3bc8f 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -2,6 +2,10 @@ /* Resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 61b2e12b5..f781aaba0 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -6,6 +6,10 @@ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 316d4ecb2..7a2b0606b 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -9,6 +9,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index 44dcb1198..9a50947f5 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index d408d1623..b479ca8ed 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/os.h> diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 05c1dd097..63077e907 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/linux/lnx_font.c b/hw/xfree86/os-support/linux/lnx_font.c index d809f97af..e9a5b6aef 100644 --- a/hw/xfree86/os-support/linux/lnx_font.c +++ b/hw/xfree86/os-support/linux/lnx_font.c @@ -23,6 +23,10 @@ *ings in this Software without prior written authorization from Egbert Eich. * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/linux/lnx_ia64.c b/hw/xfree86/os-support/linux/lnx_ia64.c index 06f2be777..cc9448f74 100644 --- a/hw/xfree86/os-support/linux/lnx_ia64.c +++ b/hw/xfree86/os-support/linux/lnx_ia64.c @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <sys/utsname.h> diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 0bd33aea7..842d9a075 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -26,6 +26,10 @@ */ /* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 5de501ae8..8d1fb456b 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -26,6 +26,10 @@ /* $XConsortium: lnx_io.c /main/8 1996/10/19 18:06:28 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 2423bd45e..dafdc0594 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,10 +23,14 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <unistd.h> #include <string.h> diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index aa959b927..dd6773fff 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -10,6 +10,10 @@ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 0cb69b209..c211d115a 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index a03e2f747..d73c69853 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 6b5bfa999..a20298ed4 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/os.h> diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index cd19f109a..371295ffd 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -25,6 +25,10 @@ */ /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 36d88a434..84db50127 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -24,6 +24,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index 364f9ee4d..afd3f8962 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index 989ee8aab..c00b6700f 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index 2edb147fe..68aca5d38 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 858b0eb65..1c12f62f9 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * @@ -23,6 +23,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if /* NO_INLINE && */ defined(__powerpc__) #include "xf86Pci.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index d9dd43d55..5d0949091 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index b4379f7be..9ff14396c 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -14,6 +14,10 @@ Thanks to Linus Torvalds for contributing this code. /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index 1c0e5d9f2..33d0789fd 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index f3afcdd50..697c07f61 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index 9a105864e..ec2c67ffa 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -16,6 +16,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index 019156357..d8053f7d2 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. @@ -12,4 +12,8 @@ #define __inline__ /**/ #undef NO_INLINE #define DO_PROTOTYPES +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "compiler.h" diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index a94ad34cc..9f251440a 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -29,6 +29,10 @@ * dependencies are dealt with, as this library will be linked in last. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> /* To prevent empty source file warnings */ diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 3489a0777..e0e7912b6 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -24,6 +24,10 @@ */ /* $XConsortium: VTsw_sco.c /main/2 1995/11/13 06:08:36 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index a0c572858..d200eccb4 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -24,6 +24,10 @@ /* Re-written May 2001 to represent the current state of reality */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index 18abcc8dc..fd4c9b780 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -24,6 +24,10 @@ /* Re-written May 2001 to represent the current state of reality */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index f056dcbe1..e9bf72890 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -23,6 +23,10 @@ /* $XConsortium$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 0df225b12..9e167852b 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -23,6 +23,10 @@ /* $XConsortium$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 76d70fbd6..dd81786bb 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -37,6 +37,10 @@ * that and adjust accordingly. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 795a65610..ac8ae3b0a 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -23,6 +23,10 @@ */ /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 3c0ca6b6e..b38470aea 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -23,6 +23,10 @@ */ /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index 8c2da5166..dc176fec9 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -31,6 +31,10 @@ * AGP GART support. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/at_scancode.c b/hw/xfree86/os-support/shared/at_scancode.c index 0b9bc674c..8947254bc 100644 --- a/hw/xfree86/os-support/shared/at_scancode.c +++ b/hw/xfree86/os-support/shared/at_scancode.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Xinput.h" #include "xf86OSKbd.h" diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 5e516221d..8bd6d3f3e 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -23,6 +23,10 @@ */ /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index c5cb404eb..b4ff8c31f 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -23,6 +23,10 @@ */ /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index 30a062276..ff4312bf5 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -29,6 +29,10 @@ * This file contains the glue needed to support various IA-64 chipsets. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <unistd.h> #include <signal.h> diff --git a/hw/xfree86/os-support/shared/ia64Pci.h b/hw/xfree86/os-support/shared/ia64Pci.h index bc4777dbb..978c9ff0e 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.h +++ b/hw/xfree86/os-support/shared/ia64Pci.h @@ -23,6 +23,10 @@ *ings in this Software without prior written authorization from Egbert Eich. * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _IA64_PCI_H # define _IA64_PCI_H diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index af5724cf1..b3ea044f9 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -28,6 +28,10 @@ * or the permissions are implicit with opening/enabling the console. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/kbd.c b/hw/xfree86/os-support/shared/kbd.c index 213e8bd62..822c8fe52 100644 --- a/hw/xfree86/os-support/shared/kbd.c +++ b/hw/xfree86/os-support/shared/kbd.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86OSKbd.h" Bool diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index ae6852ed9..620e9bf35 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86_OSproc.h" int xf86LoadKernelModule(const char *pathname) diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index 66d15b261..a77e2b94c 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(linux) && !defined(__GLIBC__) #undef __STRICT_ANSI__ #endif diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 4225e6dd4..d17ce3812 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -28,6 +28,10 @@ /* Stubs for the OS-support layer power-management functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 362c8bcdc..be3703944 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -55,6 +55,10 @@ /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 3fef72e17..f7e0c45bd 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -54,6 +54,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86Server # include <X11/X.h> # include "xf86.h" diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 358981f10..c79055853 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -27,6 +27,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.3 2005/04/20 12:25:38 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86Server #ifdef __UNIXOS2__ # define I_NEED_OS2_H diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index ba0574f24..491406f92 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 72ab99849..4704d8194 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -28,6 +28,10 @@ /* Standard resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 2a030c3dc..c678162c2 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -25,6 +25,10 @@ */ /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 5421b11c3..dd1ca3356 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 29c8a2171..237d47a4d 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -27,6 +27,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/xf86Axp.c b/hw/xfree86/os-support/shared/xf86Axp.c index 42edbc53c..b8953f119 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.c +++ b/hw/xfree86/os-support/shared/xf86Axp.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Axp.h" axpParams xf86AXPParams[] = { diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index e63619e3a..4b8b08370 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _XF86_AXP_H_ #define _XF86_AXP_H_ diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index d1c79888b..8319de04e 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2 2001/10/28 03:34:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -23,6 +23,10 @@ * OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef i386 #define _NEED_SYSI86 #endif @@ -71,7 +75,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { if (!xf86LinearVidMem()) FatalError("xf86ReadBIOS: Could not mmap BIOS" - " [a=%x]\n", Base); + " [a=%lx]\n", Base); sprintf(solx86_vtname, apertureDevName); } @@ -86,7 +90,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, if (ptr == MAP_FAILED) { xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed " - "[0x%05x, 0x%04x]\n", + "[0x%08lx, 0x%04x]\n", solx86_vtname, Base, mlen); close(fd); return -1; diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 97c6dba39..40c264ce0 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -24,6 +24,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 27996d312..c4dc23669 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 56929d69b..35d3a7731 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -25,6 +25,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index eba420937..620b18d18 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -25,6 +25,10 @@ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2005/05/21 07:46:37 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index b3fedbd0f..be01f8905 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -53,6 +53,10 @@ * of the copyright holder. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSlib.h" #include "xf86OSmouse.h" diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 60d60f9e1..3db537a3a 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(i386) || defined(__x86) #define _NEED_SYSI86 #endif diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index ebd2bacc4..3edffd446 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_init.c /main/4 1996/02/21 17:54:31 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index 3c9e8e353..6fb642bce 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_io.c /main/8 1996/10/19 18:08:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index 7365faa06..f839362fc 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index cff22e3fe..e8c26dada 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_video.c /main/8 1996/10/25 11:38:09 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #define _NEED_SYSI86 diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index 755be3dab..a14fc32e6 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -24,6 +24,10 @@ */ /* $XConsortium: xqueue.c /main/8 1996/10/19 18:08:11 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h index 2085a3e70..d693d2b36 100644 --- a/hw/xfree86/os-support/sysv/xqueue.h +++ b/hw/xfree86/os-support/sysv/xqueue.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _XF86_XQUEUE_H_ #define _XF86_XQUEUE_H_ diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 1b5124a55..fa2253655 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5 2003/08/24 19:58:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * @@ -28,6 +28,10 @@ * Author: Ivan Pascal. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Xinput.h" Bool ATScancode(InputInfoPtr pInfo, int *scanCode); @@ -104,7 +108,7 @@ typedef enum { PROT_XQUEUE, PROT_WSCONS, PROT_USB, - PROT_UNKNOWN + PROT_UNKNOWN_KBD } KbdProtocolId; typedef struct { diff --git a/hw/xfree86/os-support/xf86OSmouse.h b/hw/xfree86/os-support/xf86OSmouse.h index 7cb732237..879262991 100644 --- a/hw/xfree86/os-support/xf86OSmouse.h +++ b/hw/xfree86/os-support/xf86OSmouse.h @@ -28,6 +28,10 @@ /* 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/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h index 865738c40..449e8ddd0 100644 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ b/hw/xfree86/os-support/xf86OSpriv.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86OSPRIV_H #define _XF86OSPRIV_H diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index b65420e2b..e49e4a22c 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -74,6 +74,10 @@ * 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 f50c00ea3..391baebc6 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -66,6 +66,10 @@ /* $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 diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 9bae4ba69..ea2216b39 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -23,6 +23,10 @@ * */ +#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 5f0f78f02..ecdbfeac5 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -42,6 +42,10 @@ * 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/parser/Configint.h b/hw/xfree86/parser/Configint.h index 1659d1be4..a51116b55 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -59,6 +59,10 @@ * they should not be visible outside of the parser. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _Configint_h_ #define _Configint_h_ diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index 695c16505..93d0d4b52 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -28,6 +28,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 9bfe4d1b9..6eb2857f0 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Extensions.c b/hw/xfree86/parser/Extensions.c index 0c51a6e33..b64f08111 100644 --- a/hw/xfree86/parser/Extensions.c +++ b/hw/xfree86/parser/Extensions.c @@ -31,6 +31,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index fd18dcf2e..cbbcc74c8 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xos.h> #include "xf86Parser.h" #include "xf86tokens.h" diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index e6326a74e..bda24df1b 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 6e38bdd15..9f9323f05 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Keyboard.c b/hw/xfree86/parser/Keyboard.c index cca3ce412..4ba893a9d 100644 --- a/hw/xfree86/parser/Keyboard.c +++ b/hw/xfree86/parser/Keyboard.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 9907d29c8..56d92a79c 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index 33b591d88..7a5a25207 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index faafa1a7f..8669471a7 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index 8b373c562..81984a3e7 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index e3bf18048..d572af56c 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Vendor.c b/hw/xfree86/parser/Vendor.c index fbbb2e00f..9c6469bb8 100644 --- a/hw/xfree86/parser/Vendor.c +++ b/hw/xfree86/parser/Vendor.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index de65c415e..88788aea8 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -55,6 +55,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h index cc694666f..bb5f4e9b2 100644 --- a/hw/xfree86/parser/configProcs.h +++ b/hw/xfree86/parser/configProcs.h @@ -121,6 +121,10 @@ XF86ConfExtensionsPtr xf86parseExtensionsSection (void); void xf86printExtensionsSection (FILE * cf, XF86ConfExtensionsPtr ptr); void xf86freeExtensions (XF86ConfExtensionsPtr ptr); +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef IN_XSERVER /* Externally provided functions */ void ErrorF(const char *f, ...); diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index e2dbb3e91..4eb635b30 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -29,6 +29,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 2946dc8b1..59b0ea6fb 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index d97954d2e..ce3cda128 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdio.h> #include <stdlib.h> diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 499b6a11e..285080d99 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index d7a1e7ae5..c38f2c219 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -58,6 +58,10 @@ * This file contains the Option Record that is passed between the Parser, * and Module setup procs. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86Optrec_h_ #define _xf86Optrec_h_ #include <stdio.h> diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index b6a974d3c..71568842d 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -58,6 +58,10 @@ * This file contains the external interfaces for the XFree86 configuration * file parser. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86Parser_h_ #define _xf86Parser_h_ diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 387773dc0..3c7e68ece 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -54,6 +54,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86_tokens_h #define _xf86_tokens_h diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 3fa3ee911..13b697d85 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 68adaa31a..f500b56d7 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,5 +1,9 @@ /* $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/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c index 83c60e3fd..7221b9dac 100644 --- a/hw/xfree86/rac/xf86RACmodule.c +++ b/hw/xfree86/rac/xf86RACmodule.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static XF86ModuleVersionInfo racVersRec = diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 440b0021b..346b902dd 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a745..f01357a09 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 67469d2ed..17edaefdc 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "BT.h" typedef struct { diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 4fede5720..bf9b729d8 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index eb211883c..14543287a 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 1a2bf2065..994296517 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "IBM.h" typedef struct { diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 024cb49eb..e945dab10 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -26,6 +26,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f33247cfc..05fabb4b2 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock, diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index 81fe844a1..d66149dcf 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "TI.h" typedef struct { diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index eedb00377..f8efa8f71 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "xf86CursorPriv.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f..ff5a7c745 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 603f8ecd0..cbe62546b 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 675fce09c..527638fac 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 7821e591c..1182a3e39 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b577..92795a89a 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index b33ea8de0..6a59b4bb7 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index 0fe5ce6aa..d87defc16 100644 --- a/hw/xfree86/ramdac/xf86RamDacMod.c +++ b/hw/xfree86/ramdac/xf86RamDacMod.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index 45680a05b..ae5fc72c5 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" #include "xf86cmap.h" diff --git a/hw/xfree86/scanpci/xf86PciData.h b/hw/xfree86/scanpci/xf86PciData.h index 2253de8e5..0533d78ec 100644 --- a/hw/xfree86/scanpci/xf86PciData.h +++ b/hw/xfree86/scanpci/xf86PciData.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_DATA_H_ #define PCI_DATA_H_ diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index e2e6f65a3..14697fe46 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -19,6 +19,10 @@ * copyright notice. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86PciInfo.h" #ifndef NULL #define NULL (void *)0 diff --git a/hw/xfree86/scanpci/xf86PciStr.h b/hw/xfree86/scanpci/xf86PciStr.h index bb36d510a..307dfacdf 100644 --- a/hw/xfree86/scanpci/xf86PciStr.h +++ b/hw/xfree86/scanpci/xf86PciStr.h @@ -31,6 +31,10 @@ * to the scanpci and pcidata modules. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_PCISTR_H #define _XF86_PCISTR_H diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 4a82e6511..1daebdc5f 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -51,6 +51,10 @@ /* XXX This is including a lot of stuff that modules should not include! */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/scanpci/xf86ScanPci.h b/hw/xfree86/scanpci/xf86ScanPci.h index 3a154174a..9107b9e32 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.h +++ b/hw/xfree86/scanpci/xf86ScanPci.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef SCANPCI_H_ #define SCANPCI_H_ diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c index 6793c8f95..663f587c4 100644 --- a/hw/xfree86/shadowfb/sfbmodule.c +++ b/hw/xfree86/shadowfb/sfbmodule.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 960aa8af7..4363ad0f9 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -8,18 +8,22 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> #include "pixmapstr.h" #include "input.h" -#include "font.h" +#include <X11/fonts/font.h> #include "mi.h" #include "scrnintstr.h" #include "windowstr.h" #include "gcstruct.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "xf86.h" #include "xf86str.h" #include "shadowfb.h" diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index e42822600..d177c5f1b 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,5 +1,9 @@ /* $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/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index c1a317587..5066b753d 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -47,7 +47,7 @@ #define XINPUT #include "xf86Xinput.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "loaderProcs.h" #include <sym.h> diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 7b55c1398..b69a82b4e 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -10,6 +10,10 @@ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "vbe.h" diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 32515462e..14e8f1a1a 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -10,6 +10,10 @@ * 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.c b/hw/xfree86/vbe/vbeModes.c index c7169dd8f..678f8e120 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -30,6 +30,10 @@ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "vbe.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index 2a8d1b33a..a716f26be 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -29,6 +29,10 @@ * $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/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index d6f49a5c8..5e3a193b1 100644 --- a/hw/xfree86/vbe/vbe_module.c +++ b/hw/xfree86/vbe/vbe_module.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "vbe.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index d73c04300..85f8bbdb8 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -24,6 +24,10 @@ /* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index fb0e65b7e..07a41d128 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -12,6 +12,10 @@ #define _NEED_SYSI86 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 14dbb4be3..568d45093 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -11,6 +11,10 @@ * Author: Dirk Hohndel */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VGAHW_H #define _VGAHW_H diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c index d6044bbb7..9f5a5a9c2 100644 --- a/hw/xfree86/vgahw/vgaHWmodule.c +++ b/hw/xfree86/vgahw/vgaHWmodule.c @@ -4,6 +4,10 @@ * Copyright 1998 by The XFree86 Project, Inc */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index d4ff7bbd8..fb31fc172 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,5 +1,9 @@ /* $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/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5e2965ca9..73aab81cd 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -7,6 +7,10 @@ to the fg and bg so CopyPlane can use this. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index 7772f3387..eda0b02ca 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xmd.h> CARD32 XAAReverseBitOrder(CARD32 v); diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 272b9fb42..b3f00d696 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 5bf4c9858..45e3b6e4a 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index b614a8afb..5d2af7584 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -10,6 +10,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 13b1a6d05..d35434a18 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index de9bd2b92..a2ba8f590 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index fe73aef62..3fca17cbb 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 699491f66..43a351e22 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -34,6 +34,10 @@ * * Clipped arcs are dispatched to FillSpans. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 0cf273c5b..1136cbc8f 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -31,6 +31,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index b7178b9af..d459e979c 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 207a12668..451ade394 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index d7e6d4d52..24a916bd6 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" @@ -7,7 +11,7 @@ #include <X11/X.h> #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index 6faa7685e..5de432fed 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 090436b9b..ca53aaf7a 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index a17b152da..9016c6127 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 2f9bdb759..be1feb4fd 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 4c9b01018..e8a28d5d0 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 514a8cf42..75318e51c 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 4882f76a6..0c17a4abf 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -18,13 +18,17 @@ ********************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> -#include "font.h" +#include <X11/fonts/font.h> #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 53d0eb841..fbe029f92 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -7,6 +7,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 044e727ee..48968c41f 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 7f5923e42..359e4d4a6 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 718a99275..139fb7b81 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index abe1bbb07..cde39d9ea 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index a80388eae..b12750421 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 0f39db96d..f9fe04d1c 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 8a7d73a33..9bbecae8b 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 113be1536..a1de98c0a 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index a78ed3758..480462588 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 66d3a81e3..02a2b32ce 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 7a699fd1f..187a9dc61 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index a4298ddda..3079c6db5 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -18,13 +18,17 @@ ********************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> -#include "font.h" +#include <X11/fonts/font.h> #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 866464854..8e0e5d828 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -14,6 +14,10 @@ Original mi code written by Keith Packard. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XFree86LOADER #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index 7ec3dcf7f..5b525684a 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/hw/xfree86/xaa/xaaWrapper.h b/hw/xfree86/xaa/xaaWrapper.h index fbcf17f6f..9f413f4f7 100644 --- a/hw/xfree86/xaa/xaaWrapper.h +++ b/hw/xfree86/xaa/xaaWrapper.h @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAA_WRAPPER_H # define _XAA_WRAPPER_H diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 2f75b7e32..9decdc594 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xarch.h> #ifndef FIXEDBASE diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 883e64d5b..e01fa7894 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,5 +1,9 @@ /* $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 1c95727b3..e3f540516 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -29,6 +29,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAAROP_H #define _XAAROP_H diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 5e3e0e683..3ba0c1699 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -58,6 +58,10 @@ pGC->ops = &XAAPixmapOps;\ pixPriv->flags |= DIRTY +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef RENDER #define XAA_RENDER_PROLOGUE(pScreen,field)\ (GetPictureScreen(pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index 12695003c..832c72720 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,5 +1,9 @@ /* $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/mfbmodule.c b/hw/xfree86/xf1bpp/mfbmodule.c index 81baf5d7e..50715ccc1 100644 --- a/hw/xfree86/xf1bpp/mfbmodule.c +++ b/hw/xfree86/xf1bpp/mfbmodule.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 454091538..24c3262b7 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,5 +1,9 @@ /* $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 18104a77e..885358bb5 100644 --- a/hw/xfree86/xf1bpp/xf1bpp.h +++ b/hw/xfree86/xf1bpp/xf1bpp.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __XF1BPP_H__ #define __XF1BPP_H__ diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 9c99b1c85..0e70d6354 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -23,6 +23,10 @@ */ /* $XConsortium: OScompiler.h /main/4 1996/02/21 17:56:09 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __COMPILER_DEPENDANCIES__ #define __COMPILER_DEPENDANCIES__ diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 4a347b5d1..2f63b1435 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -30,6 +30,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index a7f115682..9ae62149f 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -28,6 +28,10 @@ * P. Shupak 1/88 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void xf4bppReplicateArea( pWin, x, y, planeMask, goalWidth, goalHeight, diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index 1e2d095ee..c4f15cad6 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -30,6 +30,10 @@ * Uses private imageFill a bunch of times */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "ibmTrace.h" diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index ae9df6e10..b54e23965 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -50,6 +50,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbbres.c /main/5 1996/02/21 17:56:30 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index 0f320ebc6..d28a6c2a3 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -49,6 +49,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbbresd.c /main/5 1996/02/21 17:56:34 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index c3f62cb64..e2cab12f5 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from the X Consortium. /* $XConsortium: mfbfillarc.c /main/4 1996/02/21 17:56:37 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index 0e5594356..eb510c0fb 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -50,6 +50,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbhrzvert.c /main/3 1996/02/21 17:56:41 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index 95d7a7fcb..03107bbf3 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -50,6 +50,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: mfbimggblt.c /main/5 1996/02/21 17:56:44 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 356028b8c..6d85f68c1 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -49,6 +49,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbline.c /main/4 1996/02/21 17:56:48 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 4853f8807..54aa3b0c9 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -36,6 +36,10 @@ in this Software without prior written authorization from the X Consortium. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index e684bf118..1bf634c80 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -43,6 +43,10 @@ */ /* $XConsortium: offscreen.c /main/4 1996/02/21 17:56:55 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "vgaVideo.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 663672878..56cab0d64 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -29,6 +29,10 @@ * Tom Paquin 8/87 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 295f52159..7686b6f9b 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -62,6 +62,10 @@ software without specific, written prior permission. */ /* $XConsortium: ppcBStore.c /main/5 1996/02/21 17:57:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "vgaVideo.h" #include "ibmTrace.h" diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index aef3c2dd5..f937aac34 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -24,6 +24,10 @@ /* $XConsortium: ppcCReduce.c /main/3 1996/02/21 17:57:17 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "ppcGCstr.h" diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index 87b387176..fe690555f 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcClip.c /main/4 1996/02/21 17:57:21 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index c6df4ef41..4673fe7ac 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #define PSZ 8 diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 5c3aff6f6..8a67cdd30 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -30,6 +30,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index ec9032e57..28c7acb6c 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcFillRct.c /main/5 1996/02/21 17:57:35 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 881dfbf05..9877b4bba 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -71,6 +71,10 @@ SOFTWARE. /* $XConsortium: ppcGC.c /main/6 1996/02/21 17:57:38 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 78273ca23..12a573c9d 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -45,6 +45,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcGCstr.h /main/3 1996/02/21 17:57:42 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "gc.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index 00cd985a7..43f626f70 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -72,6 +72,10 @@ SOFTWARE. /* $XConsortium: ppcGetSp.c /main/5 1996/02/21 17:57:45 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 6b6fb1c09..67eadfbf0 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -50,6 +50,10 @@ SOFTWARE. */ /* $XConsortium: ppcIO.c /main/8 1996/02/21 17:57:49 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 948359a30..71fcf38b1 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -24,6 +24,10 @@ /* $XConsortium: ppcImg.c /main/4 1996/02/21 17:57:53 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mi.h" diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index 957a88135..dd1bb31d9 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPixFS.c /main/3 1996/02/21 17:57:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index c3085bc4b..1f66c5850 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "servermd.h" #include "OScompiler.h" diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index f68dbdc19..11195e033 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPntWin.c /main/5 1996/02/21 17:58:04 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index 568902925..c78622482 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcPolyPnt.c /main/5 1996/02/21 17:58:07 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 8bb43eea4..085cb4b25 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -70,6 +70,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPolyRec.c /main/4 1996/02/21 17:58:11 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 267eef0ef..95914846d 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -23,6 +23,10 @@ */ /* $XConsortium: ppcQuery.c /main/3 1996/02/21 17:58:18 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index 47e427755..ce00a8799 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -57,6 +57,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * P. Shupak 12/31/87 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 9c3464de1..7d560988a 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcSetSp.c /main/5 1996/02/21 17:58:32 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index d7fd6b790..820b80e53 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcWinFS.c /main/3 1996/02/21 17:58:39 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index c15962aaf..4cf8ea3cb 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcWindow.c /main/5 1996/02/21 17:58:43 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index dc7b7965a..e13312233 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -5,6 +5,10 @@ /* $XConsortium: vgaBitBlt.c /main/8 1996/10/27 11:06:39 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index a1aecafbb..f7a3d9440 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -71,6 +71,10 @@ SOFTWARE. /* $XConsortium: vgaGC.c /main/6 1996/02/21 17:58:54 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index a03f21d2b..4806b9461 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -23,6 +23,10 @@ */ /* $XConsortium: vgaImages.c /main/5 1996/02/21 17:58:58 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index a3596e6a3..552f07140 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -35,6 +35,10 @@ SET_BYTE_REGISTER((RegGroup) + 1, Value)) /* There is a jumper on the ega to change this to 0x200 instead !! */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if 0 /* This is now a stack variable, as needed */ #define REGBASE 0x300 #endif diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 6cd15e9f5..5cb47173c 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -24,6 +24,10 @@ /* $XConsortium: vgaSolid.c /main/5 1996/02/21 17:59:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index 316b4a49b..a7bfa13d2 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -23,6 +23,10 @@ */ /* $XConsortium: vgaStipple.c /main/5 1996/02/21 17:59:10 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index f9642c0d4..1e613bb30 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -24,6 +24,10 @@ /* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> /* GJA -- for pointer data type */ #ifdef lint #if defined(volatile) diff --git a/hw/xfree86/xf4bpp/vgamodule.c b/hw/xfree86/xf4bpp/vgamodule.c index 828989dd5..932a856c2 100644 --- a/hw/xfree86/xf4bpp/vgamodule.c +++ b/hw/xfree86/xf4bpp/vgamodule.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index f3acf8123..6b501b570 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -6,6 +6,10 @@ /* $XConsortium: wm3.c /main/5 1996/02/21 17:59:21 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "wm3.h" diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 1c7261eb9..1def6f607 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -6,6 +6,10 @@ /* $XConsortium: wm3.h /main/4 1996/02/21 17:59:24 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "vgaReg.h" #ifdef PC98_EGC diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 976f27e32..8d6ccb644 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,6 +1,10 @@ /* $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__ @@ -8,7 +12,7 @@ #include "windowstr.h" #include "gcstruct.h" #include "colormapst.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #ifndef PixelType #define PixelType CARD32 #endif diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index 97586ba01..b02000493 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -1,5 +1,9 @@ /* $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_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c index 1a034980a..93f9b0126 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16module.c +++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index 06af87b57..a6bc2a67e 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index f2253de28..796311170 100644 --- a/hw/xfree86/xf8_16bpp/cfbwindow.c +++ b/hw/xfree86/xf8_16bpp/cfbwindow.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index d992b77c5..2785fa252 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _CFB8_32_H #define _CFB8_32_H diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c index 7b27e498a..6739b60fc 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32module.c +++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 437f031cc..842b872d7 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "cfb.h" #undef PSZ #include "cfb32.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 7d4812841..1a17220ab 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index 14b6f7350..011b9e763 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index ba4e3db06..d340e8c53 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -61,11 +61,15 @@ LOWMEMFTPT False False False False /* This gets built twice. Once for 8bpp and another for 32bpp */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 9a3bfc5ef..356b6cc9f 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> @@ -8,7 +12,7 @@ #undef PSZ #include "cfb32.h" #include "cfb8_32.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index cd30fcea3..79176c86a 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ #define PSZ 32 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 25736fa74..8b0ea4a78 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 1088a10f9..30ddb0c4b 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.3 2005/04/20 12:25:40 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 19b13939b..9deda1f5f 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 2ea23c59b..78d721495 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index a45804e2e..9b04eba43 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -6,6 +6,10 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h index 1d1093e54..e1b81f967 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _CFB8_32WID_H #define _CFB8_32WID_H diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c index 95f8c9d02..ff7d3de15 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c +++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index ca4322e1a..438ea0882 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -9,6 +9,10 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index 832581093..4fcd4725e 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index 1000c65f1..2e0d026f1 100644 --- a/hw/xfree86/xf8_32wid/cfbwindow.c +++ b/hw/xfree86/xf8_32wid/cfbwindow.c @@ -9,6 +9,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index f78234ea0..d5ce79f85 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -19,8 +19,8 @@ is" without express or implied warranty. #include <X11/Xproto.h> #include <X11/misc.h> #include "regionstr.h" -#include "font.h" -#include "fontstruct.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> #include "scrnintstr.h" #include "Xnest.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index f9f8ab9a1..8ef90588f 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -20,7 +20,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mistruct.h" #include "region.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index b3cccc2d5..0e80f7118 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -17,7 +17,7 @@ is" without express or implied warranty. #include <X11/X.h> #include <X11/Xproto.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index eaf1f5609..3e9a4bd9b 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -23,7 +23,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "servermd.h" #include "mi.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "Xnest.h" |