From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 14 Apr 2013 01:02:03 +0000 (-0400)
Subject: Include <fcntl.h> instead of <sys/fcntl.h>
X-Git-Tag: v202~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abad76cc4c8586bc088fec65560cf4db2e0903c2;p=thirdparty%2Fsystemd.git

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
---

diff --git a/src/journal/cat.c b/src/journal/cat.c
index a95392ccb0f..ea615783531 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 41f4b588dfe..485b301023f 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>