diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-09-02 13:57:42 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-09-02 13:57:42 +0000 |
| commit | 7cadbf1cab5fa9bcbbf63274223d314294e33289 (patch) | |
| tree | 9771bc15b5e31c29e6e7f99812d31f83dadc6be9 | |
| parent | b811f0ec193c25fdb3574487defcfdc171ab29ac (diff) | |
| download | s6-rc-7cadbf1cab5fa9bcbbf63274223d314294e33289.tar.xz | |
Adapt to s6-2.11.0.0
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | src/libs6rc/s6rc_servicedir_block.c | 2 | ||||
| -rw-r--r-- | src/libs6rc/s6rc_servicedir_manage.c | 2 | ||||
| -rw-r--r-- | src/libs6rc/s6rc_servicedir_unblock.c | 4 | ||||
| -rw-r--r-- | src/libs6rc/s6rc_servicedir_unsupervise.c | 2 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc-fdholder-filler.c | 2 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc-update.c | 4 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc.c | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/src/libs6rc/s6rc_servicedir_block.c b/src/libs6rc/s6rc_servicedir_block.c index 9038342..bc85f07 100644 --- a/src/libs6rc/s6rc_servicedir_block.c +++ b/src/libs6rc/s6rc_servicedir_block.c @@ -6,7 +6,7 @@ #include <skalibs/posixplz.h> #include <skalibs/djbunix.h> -#include <s6/s6-supervise.h> +#include <s6/supervise.h> #include <s6-rc/s6rc-servicedir.h> diff --git a/src/libs6rc/s6rc_servicedir_manage.c b/src/libs6rc/s6rc_servicedir_manage.c index fb59da2..e887fc2 100644 --- a/src/libs6rc/s6rc_servicedir_manage.c +++ b/src/libs6rc/s6rc_servicedir_manage.c @@ -6,7 +6,7 @@ #include <skalibs/direntry.h> #include <skalibs/stralloc.h> -#include <s6/s6-supervise.h> +#include <s6/supervise.h> #include <s6-rc/s6rc-servicedir.h> diff --git a/src/libs6rc/s6rc_servicedir_unblock.c b/src/libs6rc/s6rc_servicedir_unblock.c index 2a10bfd..c1ad8ab 100644 --- a/src/libs6rc/s6rc_servicedir_unblock.c +++ b/src/libs6rc/s6rc_servicedir_unblock.c @@ -3,7 +3,9 @@ #include <string.h> #include <errno.h> #include <unistd.h> -#include <s6/s6-supervise.h> + +#include <s6/supervise.h> + #include <s6-rc/s6rc-servicedir.h> int s6rc_servicedir_unblock (char const *dir, int h) diff --git a/src/libs6rc/s6rc_servicedir_unsupervise.c b/src/libs6rc/s6rc_servicedir_unsupervise.c index 44cc7b9..7fd20d7 100644 --- a/src/libs6rc/s6rc_servicedir_unsupervise.c +++ b/src/libs6rc/s6rc_servicedir_unsupervise.c @@ -2,7 +2,7 @@ #include <string.h> -#include <s6/s6-supervise.h> +#include <s6/supervise.h> #include <s6-rc/s6rc-servicedir.h> diff --git a/src/s6-rc/s6-rc-fdholder-filler.c b/src/s6-rc/s6-rc-fdholder-filler.c index efb29f1..85e003c 100644 --- a/src/s6-rc/s6-rc-fdholder-filler.c +++ b/src/s6-rc/s6-rc-fdholder-filler.c @@ -10,7 +10,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/tai.h> -#include <s6/s6-fdholder.h> +#include <s6/fdholder.h> #define USAGE "s6-rc-fdholder-filler [ -1 ] [ -t timeout ] < autofilled-filename" #define dieusage() strerr_dieusage(100, USAGE) diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c index cda92d3..209e0f0 100644 --- a/src/s6-rc/s6-rc-update.c +++ b/src/s6-rc/s6-rc-update.c @@ -27,8 +27,8 @@ #include <execline/execline.h> #include <s6/config.h> -#include <s6/s6-supervise.h> -#include <s6/s6-fdholder.h> +#include <s6/supervise.h> +#include <s6/fdholder.h> #include <s6-rc/config.h> #include <s6-rc/s6rc.h> diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c index cb269d0..4fedee4 100644 --- a/src/s6-rc/s6-rc.c +++ b/src/s6-rc/s6-rc.c @@ -21,7 +21,7 @@ #include <skalibs/unix-transactional.h> #include <s6/config.h> -#include <s6/s6-supervise.h> +#include <s6/supervise.h> #include <s6-rc/config.h> #include <s6-rc/s6rc.h> |