summaryrefslogtreecommitdiff
path: root/src/collect
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/collect
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/collect')
-rw-r--r--src/collect/collect.c4
1 files changed, 4 insertions, 0 deletions
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"