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>
---
 lib/igt_alsa.h      | 2 --
 lib/igt_audio.h     | 2 --
 lib/igt_chamelium.h | 2 --
 lib/igt_frame.h     | 2 --
 lib/igt_x86.c       | 2 --
 lib/intel_os.c      | 2 --
 6 files changed, 12 deletions(-)

(limited to 'lib')

diff --git a/lib/igt_alsa.h b/lib/igt_alsa.h
index f3949d26..8f7724ad 100644
--- a/lib/igt_alsa.h
+++ b/lib/igt_alsa.h
@@ -27,9 +27,7 @@
 #ifndef IGT_ALSA_H
 #define IGT_ALSA_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <stdbool.h>
diff --git a/lib/igt_audio.h b/lib/igt_audio.h
index 507e7ab9..21adfee8 100644
--- a/lib/igt_audio.h
+++ b/lib/igt_audio.h
@@ -27,9 +27,7 @@
 #ifndef IGT_AUDIO_H
 #define IGT_AUDIO_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <stdbool.h>
diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h
index 2a0fa234..a2d626ec 100644
--- a/lib/igt_chamelium.h
+++ b/lib/igt_chamelium.h
@@ -26,9 +26,7 @@
 #ifndef IGT_CHAMELIUM_H
 #define IGT_CHAMELIUM_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <stdbool.h>
diff --git a/lib/igt_frame.h b/lib/igt_frame.h
index 1d9bbf6a..680ad5bb 100644
--- a/lib/igt_frame.h
+++ b/lib/igt_frame.h
@@ -27,9 +27,7 @@
 #ifndef IGT_FRAME_H
 #define IGT_FRAME_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <stdbool.h>
diff --git a/lib/igt_x86.c b/lib/igt_x86.c
index 6f03849f..0f0963ce 100644
--- a/lib/igt_x86.c
+++ b/lib/igt_x86.c
@@ -25,9 +25,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_CPUID_H
 #include <cpuid.h>
diff --git a/lib/intel_os.c b/lib/intel_os.c
index e5dea6e5..6e0a46b3 100644
--- a/lib/intel_os.c
+++ b/lib/intel_os.c
@@ -26,9 +26,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 #include <stdlib.h>
-- 
cgit v1.2.3