From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 14 Feb 2012 13:44:34 +0000 (+0100)
Subject: update sd-daemon files
X-Git-Tag: 182~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a82034ba58f0bce6289fd6e550f1433f97aa74ab;p=elogind.git

update sd-daemon files
---

diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index e68b70875..763e079b4 100644
--- a/src/sd-daemon.c
+++ b/src/sd-daemon.c
@@ -32,7 +32,11 @@
 #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 <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/sd-daemon.h b/src/sd-daemon.h
index 46dc7fd7e..fe51159ee 100644
--- a/src/sd-daemon.h
+++ b/src/sd-daemon.h
@@ -58,8 +58,8 @@ extern "C" {
 
   You may find an up-to-date version of these source files online:
 
-  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
-  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
+  http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h
+  http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c
 
   This should compile on non-Linux systems, too, but with the
   exception of the sd_is_xxx() calls all functions will become NOPs.
@@ -217,6 +217,11 @@ int sd_is_mq(int fd, const char *path);
      MAINPID=...  The main pid of a daemon, in case systemd did not
                   fork off the process itself. Example: "MAINPID=4711"
 
+     WATCHDOG=1   Tells systemd to update the watchdog timestamp.
+                  Services using this feature should do this in
+                  regular intervals. A watchdog framework can use the
+                  timestamps to detect failed services.
+
   Daemons can choose to send additional variables. However, it is
   recommended to prefix variable names not listed above with X_.