From 20e1ba1c09631a3b1c850d9c8cbb42d863d0cb39 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 20 Apr 2009 15:47:19 +0200 Subject: Only define waitpid replacement if wait4 is available. (It isn't on Windows.) --- lib/replace/libreplace.m4 | 2 +- lib/replace/replace.c | 2 +- lib/replace/system/wait.h | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/replace') diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index 4eae00c54f9..2d90d9c7e85 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -106,7 +106,7 @@ AC_CHECK_HEADERS(stropts.h) AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror) AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename) -AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup) +AC_CHECK_FUNCS(waitpid wait4 strlcpy strlcat initgroups memmove strdup) AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp dup2) AC_CHECK_FUNCS(isatty chown lchown link readlink symlink realpath) AC_HAVE_DECL(setresuid, [#include ]) diff --git a/lib/replace/replace.c b/lib/replace/replace.c index a648391b23d..be277445923 100644 --- a/lib/replace/replace.c +++ b/lib/replace/replace.c @@ -359,7 +359,7 @@ char *rep_strndup(const char *s, size_t n) } #endif -#ifndef HAVE_WAITPID +#if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4) int rep_waitpid(pid_t pid,int *status,int options) { return wait4(pid, status, options, NULL); diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h index 5784b1ae924..79583ad2abc 100644 --- a/lib/replace/system/wait.h +++ b/lib/replace/system/wait.h @@ -52,4 +52,8 @@ typedef int sig_atomic_t; #endif +#if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4) +int rep_waitpid(pid_t pid,int *status,int options) +#endif + #endif -- cgit