diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | openbsd-compat/Makefile.am | 5 | ||||
| -rw-r--r-- | openbsd-compat/waitpid.c (renamed from openbsd-compat/bsd-waitpid.c) | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7912abc6..13c8aa5f 100644 --- a/configure.ac +++ b/configure.ac @@ -2024,6 +2024,8 @@ AM_CONDITIONAL([NEED_STRSEP], [test "x$ac_cv_have_strsep" != "xyes"]) AM_CONDITIONAL([NEED_STRTONUM], [test "x$ac_cv_have_strtonum" != "xyes"]) AM_CONDITIONAL([NEED_STRNDUP], [test "x$ac_cv_have_strndup" != "xyes"]) AM_CONDITIONAL([NEED_STRNLEN], [test "x$ac_cv_have_strnlen" != "xyes"]) + +AM_CONDITIONAL([NEED_WAITPID], [test "x$ac_cv_have_waitpid" != "xyes"]) ## diff --git a/openbsd-compat/Makefile.am b/openbsd-compat/Makefile.am index 3bccf09c..1a0fe160 100644 --- a/openbsd-compat/Makefile.am +++ b/openbsd-compat/Makefile.am @@ -135,6 +135,11 @@ if NEED_STRNLEN libopenbsd_compat_a_SOURCES += strnlen.c endif +if NEED_WAITPID +libopenbsd_compat_a_SOURCES += waitpid.c +endif + + if !SUPPORT_ERR_H libopenbsd_compat_a_SOURCES += bsd-err.c diff --git a/openbsd-compat/bsd-waitpid.c b/openbsd-compat/waitpid.c index 40e6ffaa..3ef68a53 100644 --- a/openbsd-compat/bsd-waitpid.c +++ b/openbsd-compat/waitpid.c @@ -24,7 +24,6 @@ #include "includes.h" -#ifndef HAVE_WAITPID #include <errno.h> #include <sys/wait.h> #include "bsd-waitpid.h" @@ -49,5 +48,3 @@ waitpid(int pid, int *stat_loc, int options) return (wait_pid); } - -#endif /* !HAVE_WAITPID */ |