summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-13 21:02:03 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-13 21:02:03 -0400
commitabad76cc4c8586bc088fec65560cf4db2e0903c2 (patch)
treec08cb13197816338bbcd2fe0dffb18a80b96ca60
parentd3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc (diff)
Include <fcntl.h> instead of <sys/fcntl.h>
<fcntl.h> is POSIX. On Linux, <sys/fcntl.h> simply includes <fcntl.h>, so there should be on difference. On Android likewise, except that there is some more stuff. QNX has only <fcntl.h>. https://bugs.freedesktop.org/show_bug.cgi?id=63423
-rw-r--r--src/journal/cat.c2
-rw-r--r--src/libsystemd-daemon/sd-daemon.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c
index a95392ccb0..ea61578353 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <systemd/sd-journal.h>
diff --git a/src/libsystemd-daemon/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c
index 41f4b588df..485b301023 100644
--- a/src/libsystemd-daemon/sd-daemon.c
+++ b/src/libsystemd-daemon/sd-daemon.c
@@ -32,11 +32,7 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
-#ifdef __BIONIC__
-# include <linux/fcntl.h>
-#else
-# include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>