summaryrefslogtreecommitdiff
path: root/src/ata_id/ata_id.c
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-03-22 18:07:36 -0400
committerAnthony G. Basile <blueness@gentoo.org>2014-03-22 18:07:36 -0400
commit974354dee5f5abdea22958c3d57f41d9425f1a8c (patch)
treedd41833061190721b495b575d108b1bd3a2b552e /src/ata_id/ata_id.c
parentac73951d246e035b92771bdddc2892bdabeed760 (diff)
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>
Diffstat (limited to 'src/ata_id/ata_id.c')
-rw-r--r--src/ata_id/ata_id.c6
1 files changed, 5 insertions, 1 deletions
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"