Commit e2e50c50 authored by Eric Anholt's avatar Eric Anholt Committed by Adam Jackson

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's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 266af991
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include <stddef.h> #include <stddef.h>
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include <stddef.h> #include <stddef.h>
......
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include "xf86.h" #include "xf86.h"
......
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
*/ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#define _PARSE_EDID_ #define _PARSE_EDID_
......
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include "xf86Modes.h" #include "xf86Modes.h"
......
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include "xf86.h" #include "xf86.h"
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include <stddef.h> #include <stddef.h>
......
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include "xf86.h" #include "xf86.h"
......
...@@ -62,10 +62,6 @@ ...@@ -62,10 +62,6 @@
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#else
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif #endif
#include "xf86.h" #include "xf86.h"
......
...@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
......
...@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment