From a58812d5404844274298344babdb079e161d164f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 16 Oct 2026 07:12:56 +0000 Subject: Prepare for 2.16.0.0, remove waitn*, change openslurpclose_at --- src/include/skalibs/djbunix.h | 6 ------ src/include/skalibs/unix-transactional.h | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/include') diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h index 0bba29a..51be4aa 100644 --- a/src/include/skalibs/djbunix.h +++ b/src/include/skalibs/djbunix.h @@ -74,13 +74,7 @@ extern pid_t wait_nointr (int *) ; #define wait_nohang(wstat) waitpid_nohang(-1, (wstat)) extern pid_t wait_pid_nohang (pid_t, int *) ; extern int wait_pids_nohang (pid_t const *, unsigned int, int *) ; - -/* These will disappear or be refactored */ extern unsigned int wait_reap (void) ; -extern int waitn (pid_t *, unsigned int) ; -extern int waitn_posix (pid_t *, unsigned int, int *) ; -extern int waitn_reap (pid_t *, unsigned int) ; -extern int waitn_reap_posix (pid_t *, unsigned int, int *) ; extern int fd_chdir (int) ; diff --git a/src/include/skalibs/unix-transactional.h b/src/include/skalibs/unix-transactional.h index 9b884f9..ae8a263 100644 --- a/src/include/skalibs/unix-transactional.h +++ b/src/include/skalibs/unix-transactional.h @@ -40,7 +40,8 @@ extern int openc_appendat (int, char const *) ; extern int openc_appendatb (int, char const *) ; extern ssize_t openreadnclose_at (int, char const *, char *, size_t) ; -extern int openslurpclose_at (int, char const *, stralloc *) ; +#define openslurpclose_at(dirfd, fn, sa) openslurpnclose_at(dirfd, fn, (sa), 0) +extern int openslurpnclose_at (int, char const *, stralloc *, size_t) ; extern int opengetlnclose_at (int, char const *, stralloc *, int) ; extern size_t openwritenclose_at (int, char const *, char const *, size_t) ; -- cgit v1.3.1