summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-02-10 22:19:16 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-02-11 11:48:02 +0100
commit6cfd16648d8d229c4ab474e4beff1cc131287238 (patch)
treea6fc9f83316ccc7baee1dfaea0d3433b7afeb260
parentb39a74ba4ef36889465b03c93d3d4940b21af465 (diff)
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>
-rw-r--r--lib/intel_drm.c4
-rw-r--r--lib/intel_mmio.c5
-rw-r--r--lib/intel_pci.c4
3 files changed, 0 insertions, 13 deletions
diff --git a/lib/intel_drm.c b/lib/intel_drm.c
index 4a919d3e..36a24fab 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 a158b047..b266847e 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 08fac3e3..7228daec 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>