INN commit: trunk (3 files)

[INN Commit]

    Date: Friday, March 26, 2021 @ 11:59:40
  Author: iulius
Revision: 10551

Update to latest upstream rra-c-util 9.0 version

Modified:
  trunk/include/portable/sd-daemon.h
  trunk/lib/Makefile
  trunk/lib/sd-daemon.c

------------------------------+
 include/portable/sd-daemon.h |    7 +++++++
 lib/Makefile                 |    5 ++++-
 lib/sd-daemon.c              |    3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

Modified: include/portable/sd-daemon.h
===================================================================
--- include/portable/sd-daemon.h	2021-03-26 18:57:58 UTC (rev 10550)
+++ include/portable/sd-daemon.h	2021-03-26 18:59:40 UTC (rev 10551)
@@ -34,6 +34,11 @@
 #ifndef PORTABLE_SD_DAEMON_H
 #define PORTABLE_SD_DAEMON_H 1
 
+#include "config.h"
+#include "portable/macros.h"
+
+BEGIN_DECLS
+
 #ifdef HAVE_SD_NOTIFY
 #    include <systemd/sd-daemon.h>
 #else
@@ -44,4 +49,6 @@
 int sd_notifyf(int, const char *, ...);
 #endif
 
+END_DECLS
+
 #endif /* !PORTABLE_SD_DAEMON_H */

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2021-03-26 18:57:58 UTC (rev 10550)
+++ lib/Makefile	2021-03-26 18:59:40 UTC (rev 10551)
@@ -617,7 +617,10 @@
   ../include/config.h ../include/inn/macros.h \
   ../include/portable/stdbool.h
 sd-daemon.o: sd-daemon.c ../include/portable/macros.h \
-  ../include/portable/sd-daemon.h
+  ../include/portable/sd-daemon.h ../include/config.h \
+  ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
+  ../include/inn/defines.h ../include/inn/options.h
 setenv.o: setenv.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \

Modified: lib/sd-daemon.c
===================================================================
--- lib/sd-daemon.c	2021-03-26 18:57:58 UTC (rev 10550)
+++ lib/sd-daemon.c	2021-03-26 18:59:40 UTC (rev 10551)
@@ -7,6 +7,9 @@
  * run under systemd.  Unsetting the environment (the first argument) is not
  * supported.
  *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
  * Copyright 2021 Russ Allbery <eagle at eyrie.org>
  *
  * Copying and distribution of this file, with or without modification, are