Remove pointless Android ifdefs for sys/fcntl.h.

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@whitecape.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/lib/intel_drm.c b/lib/intel_drm.c
index 4a919d3..36a24fa 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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>