From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 22 Mar 2014 20:29:01 +0000 (+0100)
Subject: lib: unnecessary header removal for drmtest.h, part 2
X-Git-Tag: intel-gpu-tools-1.7~223
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=254f19ba8dc4b00d0d5df0a4f8d0a0cb104b2df5;p=profile%2Fextras%2Fintel-gpu-tools.git

lib: unnecessary header removal for drmtest.h, part 2

I've left unistd.h in it - it's not strictly required but most users
of drmtest.h want it for the open helpers, and then you kinda need to
close that file descriptor again ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index b44433f..40bdbcf 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -53,8 +53,10 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
+
+#include <drm.h>
+#include <i915_drm.h>
+
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 4c55068..97d60d0 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -28,16 +28,13 @@
 #ifndef DRMTEST_H
 #define DRMTEST_H
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/mman.h>
 
-#include "xf86drm.h"
-#include "xf86drmMode.h"
-#include "intel_batchbuffer.h"
+#include <xf86drm.h>
+#include <intel_batchbuffer.h>
 
 #ifdef ANDROID
 #ifndef HAVE_MMAP64
diff --git a/lib/igt_core.c b/lib/igt_core.c
index efcc4a1..81e3731 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -48,9 +48,9 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "drmtest.h"
-#include "i915_drm.h"
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
 #include "igt_debugfs.h"
diff --git a/lib/igt_core.h b/lib/igt_core.h
index 47576da..7ede0d3 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -32,8 +32,10 @@
 
 #include <setjmp.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#include <stdarg.h>
 
 bool __igt_fixture(void);
 void __igt_fixture_complete(void);
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c
index f467ce0..96adf39 100644
--- a/lib/igt_debugfs.c
+++ b/lib/igt_debugfs.c
@@ -27,6 +27,7 @@
 #include <sys/mount.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 88ee83b..f74f707 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -23,14 +23,18 @@
  */
 
 #define _GNU_SOURCE
+#include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <stdlib.h>
 #include <math.h>
 #include <linux/kd.h>
-#include "drm_fourcc.h"
+#include <errno.h>
+
+#include <drm_fourcc.h>
 
 #include "drmtest.h"
 #include "igt_kms.h"
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index d141cfc..95735e8 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -29,6 +29,8 @@
 #include <stdint.h>
 #include <cairo.h>
 
+#include <xf86drmMode.h>
+
 #include "igt_display.h"
 
 struct kmstest_connector_config {
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 147334f..5806f2a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -47,6 +47,7 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "i915_drm.h"
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
index 22f0ab2..ed46e51 100644
--- a/tests/core_getclient.c
+++ b/tests/core_getclient.c
@@ -27,6 +27,9 @@
 
 #include <limits.h>
 #include <sys/ioctl.h>
+#include <stdlib.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 /**
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
index cce8271..1e2c565 100644
--- a/tests/core_getstats.c
+++ b/tests/core_getstats.c
@@ -27,6 +27,11 @@
 
 #include <limits.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <drm.h>
+
+#include "igt_core.h"
 #include "drmtest.h"
 
 /**
diff --git a/tests/gem_ctx_bad_destroy.c b/tests/gem_ctx_bad_destroy.c
index 092f342..97a7066 100644
--- a/tests/gem_ctx_bad_destroy.c
+++ b/tests/gem_ctx_bad_destroy.c
@@ -31,6 +31,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_ctx_create.c b/tests/gem_ctx_create.c
index f32c228..57494fc 100644
--- a/tests/gem_ctx_create.c
+++ b/tests/gem_ctx_create.c
@@ -27,6 +27,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c
index cd53caf..2ba85f2 100644
--- a/tests/gem_fenced_exec_thrash.c
+++ b/tests/gem_fenced_exec_thrash.c
@@ -33,9 +33,11 @@
 #include <string.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <errno.h>
+
 #include <drm.h>
-#include "ioctl_wrappers.h"
 
+#include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index 26c71ce..3353b83 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "ioctl_wrappers.h"
diff --git a/tests/gem_reg_read.c b/tests/gem_reg_read.c
index 19f1351..b4a6650 100644
--- a/tests/gem_reg_read.c
+++ b/tests/gem_reg_read.c
@@ -27,6 +27,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index 19c0201..30d1a86 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -41,6 +41,7 @@
 #include <wordexp.h>
 #include <getopt.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 4fb2a21..157d674 100644
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -43,6 +43,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
diff --git a/tests/igt_simulation.c b/tests/igt_simulation.c
index f4007b8..d333117 100644
--- a/tests/igt_simulation.c
+++ b/tests/igt_simulation.c
@@ -29,6 +29,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <assert.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "igt_core.h"
diff --git a/tests/pm_psr.c b/tests/pm_psr.c
index 5d28c7a..4ba121f 100644
--- a/tests/pm_psr.c
+++ b/tests/pm_psr.c
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 #define SLEEP_DURATION 5000 // in milliseconds
diff --git a/tests/pm_rc6_residency.c b/tests/pm_rc6_residency.c
index 3fd9d47..84eb8a9 100644
--- a/tests/pm_rc6_residency.c
+++ b/tests/pm_rc6_residency.c
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 #define SLEEP_DURATION 3000 // in milliseconds
diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index e6ab379..1f4b284 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -34,6 +34,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "intel_gpu_tools.h"
diff --git a/tests/prime_udl.c b/tests/prime_udl.c
index 892a952..96661fc 100644
--- a/tests/prime_udl.c
+++ b/tests/prime_udl.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 
 #include "xf86drm.h"
-#include "xf86drmMode.h"
+#include <xf86drmMode.h>
+
 #include "ioctl_wrappers.h"
 #include "intel_bufmgr.h"
 #include "intel_gpu_tools.h"