diff options
Diffstat (limited to 'hw/xfree86/os-support')
126 files changed, 527 insertions, 23 deletions
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 |