[Intel-gfx] [PATCH] Remove pointless Android ifdefs for sys/fcntl.h.

Kenneth Graunke kenneth at whitecape.org
Sat Feb 11 07:19:16 CET 2012


On my system, sys/fcntl.h contains exactly one line:

   #include <fcntl.h>

So there's really no need to #ifdef it.  Also, intel_mmio.c already
included <fcntl.h>; there's no need to include it twice.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 lib/intel_drm.c  |    4 ----
 lib/intel_mmio.c |    5 -----
 lib/intel_pci.c  |    4 ----
 3 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/lib/intel_drm.c b/lib/intel_drm.c
index 4a919d3..36a24fa 100644
--- a/lib/intel_drm.c
+++ b/lib/intel_drm.c
@@ -36,11 +36,7 @@
 #include <err.h>
 #include <assert.h>
 #include <sys/ioctl.h>
-#ifdef ANDROID
 #include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
 #include <sys/stat.h>
 #include <sys/mman.h>
 #ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index a158b04..b266847 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -38,11 +38,6 @@
 #include <err.h>
 #include <assert.h>
 #include <sys/ioctl.h>
-#ifdef ANDROID
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
 #include <sys/stat.h>
 #include <sys/mman.h>
 
diff --git a/lib/intel_pci.c b/lib/intel_pci.c
index 08fac3e..7228dae 100644
--- a/lib/intel_pci.c
+++ b/lib/intel_pci.c
@@ -33,11 +33,7 @@
 #include <err.h>
 #include <assert.h>
 #include <sys/ioctl.h>
-#ifdef ANDROID
 #include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-- 
1.7.7.6




More information about the Intel-gfx mailing list