[i-g-t,02/22] build: Nuke #ifdef HAVE_CONFIG_H cargo-cult

Commit Message

Daniel Vetter Sept. 5, 2017, 12:36 p.m. UTC

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 <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
---
 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 --
 overlay/overlay.h               | 2 --
 overlay/x11/position.c          | 2 --
 tests/amdgpu/amd_basic.c        | 2 --
 tests/debugfs_test.c            | 2 --
 tests/gem_fence_thrash.c        | 2 --
 tests/gem_fence_upload.c        | 2 --
 tests/gem_render_linear_blits.c | 2 --
 tests/kms_flip.c                | 2 --
 tests/kms_render.c              | 2 --
 tests/kms_setmode.c             | 2 --
 tests/testdisplay.c             | 2 --
 tests/testdisplay_hotplug.c     | 2 --
 tests/tools_test.c              | 2 --
 tools/intel_gpu_top.c           | 2 --
 tools/intel_gvtg_test.c         | 2 --
 tools/intel_l3_parity.c         | 2 --
 tools/intel_l3_udev_listener.c  | 2 --
 23 files changed, 46 deletions(-)

Patch

diff --git a/lib/igt_alsa.h b/lib/igt_alsa.h
index f3949d262a4f..8f7724ad9727 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 507e7ab9c661..21adfee82756 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 2a0fa234ec60..a2d626eca957 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 1d9bbf6a7010..680ad5bbd293 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 6f03849f6ff2..0f0963ced044 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 e5dea6e5a619..6e0a46b3c35c 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>
diff --git a/overlay/overlay.h b/overlay/overlay.h
index 793816d2e044..7bc7ada7eafa 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 cd0035394086..9e3db3709ef7 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
diff --git a/tests/amdgpu/amd_basic.c b/tests/amdgpu/amd_basic.c
index 5e44b123fcaf..9f21de65bf10 100644
--- a/tests/amdgpu/amd_basic.c
+++ b/tests/amdgpu/amd_basic.c
@@ -22,9 +22,7 @@ 
  * Based on libdrm/tests/amdgpu/basic_tests.c
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/debugfs_test.c b/tests/debugfs_test.c
index 1663fd41eab8..5e7805e1559e 100644
--- a/tests/debugfs_test.c
+++ b/tests/debugfs_test.c
@@ -20,9 +20,7 @@ 
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "igt.h"
 #include "igt_sysfs.h"
 #include <fcntl.h>
diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c
index 52095f26fdca..14d026a99f71 100644
--- a/tests/gem_fence_thrash.c
+++ b/tests/gem_fence_thrash.c
@@ -26,9 +26,7 @@ 
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <unistd.h>
diff --git a/tests/gem_fence_upload.c b/tests/gem_fence_upload.c
index 7d9acdc0fcb3..f3b0e62fa7a7 100644
--- a/tests/gem_fence_upload.c
+++ b/tests/gem_fence_upload.c
@@ -25,9 +25,7 @@ 
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <unistd.h>
diff --git a/tests/gem_render_linear_blits.c b/tests/gem_render_linear_blits.c
index 5fc8cc5e3abe..db34d427385a 100644
--- a/tests/gem_render_linear_blits.c
+++ b/tests/gem_render_linear_blits.c
@@ -33,9 +33,7 @@ 
  * The goal is to simply ensure the basics work.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <stdlib.h>
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 837ebecda733..06cb3ff29351 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -21,9 +21,7 @@ 
  * IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 
diff --git a/tests/kms_render.c b/tests/kms_render.c
index fd33dfb7cafe..d2208e38f84e 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -20,9 +20,7 @@ 
  * Authors:
  *    Imre Deak <[e-mail]>
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <cairo.h>
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index a7a48de44b0e..206d360607bb 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -20,9 +20,7 @@ 
  * Authors:
  *    Imre Deak <[e-mail]>
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <cairo.h>
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index f2a41fa0e53b..b0156c5cf0e1 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -45,9 +45,7 @@ 
  *  - DP commands (e.g. poweroff)
  * - verify outputs against VBT/physical connectors
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <cairo.h>
diff --git a/tests/testdisplay_hotplug.c b/tests/testdisplay_hotplug.c
index cf1551183c56..ca1d849d978d 100644
--- a/tests/testdisplay_hotplug.c
+++ b/tests/testdisplay_hotplug.c
@@ -29,9 +29,7 @@ 
 #include <sys/stat.h>
 
 #include "testdisplay.h"
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 
 #ifdef HAVE_UDEV
diff --git a/tests/tools_test.c b/tests/tools_test.c
index ccd165de6ca8..3122bb4f7da2 100644
--- a/tests/tools_test.c
+++ b/tests/tools_test.c
@@ -20,9 +20,7 @@ 
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "igt.h"
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 3fe77f707705..7454de878dd1 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -27,9 +27,7 @@ 
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/tools/intel_gvtg_test.c b/tools/intel_gvtg_test.c
index 3db2c89bdac4..7a29fbdde7cd 100644
--- a/tools/intel_gvtg_test.c
+++ b/tools/intel_gvtg_test.c
@@ -28,9 +28,7 @@ 
  * TODO:
  * Enable more GVT-g related test cases.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "igt.h"
 #include <errno.h>
diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c
index eb00c50d33e4..26b7caaa1576 100644
--- a/tools/intel_l3_parity.c
+++ b/tools/intel_l3_parity.c
@@ -39,9 +39,7 @@ 
 #include "intel_io.h"
 #include "igt_sysfs.h"
 #include "drmtest.h"
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #ifdef HAVE_UDEV
 #include <libudev.h>
 #include <syslog.h>
diff --git a/tools/intel_l3_udev_listener.c b/tools/intel_l3_udev_listener.c
index 270bfff44f0f..57a0f0bf713b 100644
--- a/tools/intel_l3_udev_listener.c
+++ b/tools/intel_l3_udev_listener.c
@@ -21,9 +21,7 @@ 
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_UDEV
 #include <libudev.h>