diff options
| author | Manoj Kasichainula <manoj@apache.org> | 1999-11-30 00:33:24 +0100 |
|---|---|---|
| committer | Manoj Kasichainula <manoj@apache.org> | 1999-11-30 00:33:24 +0100 |
| commit | a7a251cb299582b1bc37bc939fecf2dbe5324afb (patch) | |
| tree | b717a832ac1bd75c962f14d1e0590a4ae9aa5f0a /os/unix | |
| parent | First cut at getting graceful restart working with the AcceptEx completion port (diff) | |
| download | apache2-a7a251cb299582b1bc37bc939fecf2dbe5324afb.tar.xz apache2-a7a251cb299582b1bc37bc939fecf2dbe5324afb.zip | |
The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84186 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os/unix')
| -rw-r--r-- | os/unix/unixd.c | 2 | ||||
| -rw-r--r-- | os/unix/unixd.h | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/os/unix/unixd.c b/os/unix/unixd.c index 7a6b3add09..ee817c491a 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -82,7 +82,7 @@ void unixd_detach(void) } RAISE_SIGSTOP(DETACH); #endif -#ifndef NO_SETSID +#ifdef HAVE_SETSID if ((pgrp = setsid()) == -1) { perror("setsid"); ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, diff --git a/os/unix/unixd.h b/os/unix/unixd.h index 0f26ed04db..733c90b927 100644 --- a/os/unix/unixd.h +++ b/os/unix/unixd.h @@ -89,7 +89,10 @@ const char *unixd_set_group(cmd_parms *cmd, void *dummy, char *arg); #ifdef SYS_SIGLIST /* platform has sys_siglist[] */ #define INIT_SIGLIST() /* nothing */ -#else /* platform has no sys_siglist[], define our own */ +#elif defined(SYS_SIGLIST_DECLARED) /* from autoconf */ +#define INIT_SIGLIST() /* nothing */ +#define SYS_SIGLIST sys_siglist +#else #define NEED_AP_SYS_SIGLIST extern const char *ap_sys_siglist[NumSIG]; #define SYS_SIGLIST ap_sys_siglist @@ -97,6 +100,12 @@ void unixd_siglist_init(void); #define INIT_SIGLIST() unixd_siglist_init(); #endif /* platform has sys_siglist[] */ +#ifdef HAVE_KILLPG +#define unixd_killpg(x, y) (killpg ((x), (y))) +#else /* HAVE_KILLPG */ +#define unixd_killpg(x, y) (kill (-(x), (y))) +#endif /* HAVE_KILLPG */ + #define UNIX_DAEMON_COMMANDS \ { "User", unixd_set_user, NULL, RSRC_CONF, TAKE1, \ "Effective user id for this server"}, \ |