Revisit issue #87: fails to build on linux headers 3.13

Dropping <fcntl.h> in favor of <linux/fcntl.h> is incorrect.  Yet
uClibc needs O_CLOEXEC from <linux/fcntl.h>.  So we re-introduce
<fcntl.h> and include <linux/fcntl.h> only on uClibc systems to
avoid redefinitions.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

5 files changed, 21 insertions, 1 deletions

diff --git a/src/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
index 386775b619..beed53c6d3 100644
--- a/src/accelerometer/accelerometer.c
+++ b/src/accelerometer/accelerometer.c
@@ -50,13 +50,17 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <limits.h>
 #include <linux/limits.h>
 #include <linux/input.h>
+
+#ifdef __UCLIBC__
 #include <linux/fcntl.h>
+#endif
 
 #include "libudev.h"
 #include "libudev-private.h"
diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c
index 500669ce94..93dbb53b10 100644
--- a/src/ata_id/ata_id.c
+++ b/src/ata_id/ata_id.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -38,9 +39,12 @@
 #include <linux/fs.h>
 #include <linux/cdrom.h>
 #include <linux/bsg.h>
-#include <linux/fcntl.h>
 #include <arpa/inet.h>
 
+#ifdef __UCLIBC__
+#include <linux/fcntl.h>
+#endif
+
 #include "libudev.h"
 #include "libudev-private.h"
 #include "log.h"
diff --git a/src/collect/collect.c b/src/collect/collect.c
index b99a170420..9d1a97e017 100644
--- a/src/collect/collect.c
+++ b/src/collect/collect.c
@@ -24,12 +24,16 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <signal.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#ifdef __UCLIBC__
 #include <linux/fcntl.h>
+#endif
 
 #include "libudev.h"
 #include "libudev-private.h"
diff --git a/src/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
index bab2e8e97e..ffba0eb51f 100644
--- a/src/mtd_probe/mtd_probe.c
+++ b/src/mtd_probe/mtd_probe.c
@@ -22,9 +22,13 @@
 #include <mtd/mtd-user.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+
+#ifdef __UCLIBC__
 #include <linux/fcntl.h>
+#endif
 
 int main(int argc, char** argv)
 {
diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
index 7c5f7a35ef..b9a94e66e6 100644
--- a/src/scsi_id/scsi_serial.c
+++ b/src/scsi_id/scsi_serial.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -32,7 +33,10 @@
 #include <scsi/sg.h>
 #include <linux/types.h>
 #include <linux/bsg.h>
+
+#ifdef __UCLIBC__
 #include <linux/fcntl.h>
+#endif
 
 #include "libudev.h"
 #include "libudev-private.h"