From b36f978b243b21166a58929ff4c3c66bba7ed8dd Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 5 Sep 2017 14:36:04 +0200
Subject: build: Nuke #ifdef HAVE_CONFIG_H cargo-cult

We have it. Daniel Stone said the #ifdef HAVE_CONFIG_H comes from the
X11 transition to the modular build, where in the imake -> modular
build transition config.h wasn't universally available. Now we just
make this a requirement (so yeah Android better generate one too).

v2: Improve commit message a bit.

Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 overlay/overlay.h      | 2 --
 overlay/x11/position.c | 2 --
 2 files changed, 4 deletions(-)

(limited to 'overlay')

diff --git a/overlay/overlay.h b/overlay/overlay.h
index 793816d2..7bc7ada7 100644
--- a/overlay/overlay.h
+++ b/overlay/overlay.h
@@ -25,9 +25,7 @@
 #ifndef OVERLAY_H
 #define OVERLAY_H
 
-#ifdef HAVE_CONFIG_H
 #include"config.h"
-#endif
 
 #include <cairo.h>
 
diff --git a/overlay/x11/position.c b/overlay/x11/position.c
index cd003539..9e3db370 100644
--- a/overlay/x11/position.c
+++ b/overlay/x11/position.c
@@ -22,9 +22,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <X11/Xlib.h>
 #ifdef HAVE_XRANDR
-- 
cgit v1.2.3