diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 11:32:19 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 11:32:19 -0800 |
| commit | 7971392cdd814795c217ad29a53d1cc40f3b4c4d (patch) | |
| tree | cd4c81177893a2409ceab29ff964c42ff1300ca7 | |
| parent | 96c637350d1117d18a10ca3de40814b506c8ffc3 (diff) | |
| parent | 585a32be887835758cbdf85185cf1c955a0c5687 (diff) | |
Merge branch 'server-1.2-branch' into server-1.3-branch
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86DiDGA.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86EdidModes.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Modes.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86cvt.c | 4 |
7 files changed, 28 insertions, 0 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index ab7070be6..5e0a0c602 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -22,6 +22,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include <stddef.h> diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index f4ac4ded3..551f052c9 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -22,6 +22,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include "xf86.h" diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 0476a6838..77c0c875c 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -27,6 +27,10 @@ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include "xf86.h" diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index d126e5edc..0706783ae 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -30,6 +30,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include <stddef.h> diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index bafe71f70..2a5d7bab2 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -25,6 +25,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include "xf86.h" diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 1e79063a7..1d55a6e79 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -22,6 +22,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include <stddef.h> diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c index 425657762..dd6febf2c 100644 --- a/hw/xfree86/modes/xf86cvt.c +++ b/hw/xfree86/modes/xf86cvt.c @@ -33,6 +33,10 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> +#else +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #endif #include "xf86.h" |