[systemd-commits] src/journal src/libsystemd-daemon

[Zbigniew Jędrzejewski-Szmek]

 src/journal/cat.c                 |    2 +-
 src/libsystemd-daemon/sd-daemon.c |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit abad76cc4c8586bc088fec65560cf4db2e0903c2
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Apr 13 21:02:03 2013 -0400

    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 a95392c..ea61578 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 41f4b58..485b301 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>