diff options
| author | Eric Anholt <eric@anholt.net> | 2017-03-22 15:11:35 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-03-23 13:19:51 -0400 |
| commit | e2e50c509718ea8c7f4684dc18f5ce66e526792b (patch) | |
| tree | 7058dfa9ee570617a3a6037eb37fb850e7e7ae08 | |
| parent | 266af991c8e41e62f054ac9870468a9ba2aaa9f2 (diff) | |
| download | xserver-e2e50c509718ea8c7f4684dc18f5ce66e526792b.tar.gz | |
xserver: Unifdef HAVE_CONFIG_H
The X Server never generates a global config.h, and instead all these
paths are including dix-config.h or xorg-config.h.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Cursors.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 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86gtf.c | 4 | ||||
| -rw-r--r-- | xkb/XKBMAlloc.c | 2 | ||||
| -rw-r--r-- | xkb/XKBMisc.c | 2 |
11 files changed, 0 insertions, 40 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 966a16891..3f9857b4a 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -23,10 +23,6 @@ #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/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 9543eedb3..26969efb2 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -23,10 +23,6 @@ #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 645727441..368649852 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -22,10 +22,6 @@ #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 b4ab14fc5..a2e960d42 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -29,10 +29,6 @@ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> -#else -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #endif #define _PARSE_EDID_ diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 43b223307..5651f1ef8 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -27,10 +27,6 @@ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> -#else -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #endif #include "xf86Modes.h" diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index d83461997..900048df9 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -22,10 +22,6 @@ #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 13e5a5059..85ab9b8c7 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -23,10 +23,6 @@ #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 b6c1bc81c..c0a342040 100644 --- a/hw/xfree86/modes/xf86cvt.c +++ b/hw/xfree86/modes/xf86cvt.c @@ -28,10 +28,6 @@ #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/xf86gtf.c b/hw/xfree86/modes/xf86gtf.c index 17c2f3255..c6a738422 100644 --- a/hw/xfree86/modes/xf86gtf.c +++ b/hw/xfree86/modes/xf86gtf.c @@ -62,10 +62,6 @@ #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/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index dbc1389e6..3e380a8ea 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#elif defined(HAVE_CONFIG_H) -#include <config.h> #endif #include <stdio.h> diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index df268b583..f17194528 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#elif defined(HAVE_CONFIG_H) -#include <config.h> #endif #include <stdio.h> |