From: Jeff Trawick <trawick@apache.org>
Date: Wed, 5 Apr 2000 02:09:44 +0000 (+0000)
Subject: stop relying on a macro to map signal() to ap_signal(); call
X-Git-Tag: apache-doc-split-01~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98730c630f957d369f0422939153c13262495dff;p=thirdparty%2Fapache%2Fhttpd.git

stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_config.h b/include/ap_config.h
index da2f6959f48..8a5c7fca29b 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -1142,28 +1142,6 @@ int setrlimit(int, struct rlimit *);
 #define INADDR_NONE ((unsigned long) -1)
 #endif
 
-#if 0
-/* This stuff taken care of in APR XXXXX */
-/*
- * Replace signal function with sigaction equivalent
- */
-#ifndef NO_USE_SIGACTION
-typedef void Sigfunc(int);
-
-#if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((Sigfunc *)-1)
-#endif
-
-/*
- * For some strange reason, QNX defines signal to signal. Eliminate it.
- */
-#ifdef signal
-#undef signal
-#endif
-#define signal(s,f)	ap_signal(s,f)
-Sigfunc *signal(int signo, Sigfunc * func);
-#endif
-#endif
 #include <setjmp.h>
 
 #if defined(USE_LONGJMP)
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index cbeed863b8c..7f78ebc1b3e 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -507,7 +507,7 @@ static int cgid_server(void *data)
     cgid_server_conf *sconf = (cgid_server_conf *)ap_get_module_config( 
                        main_server->module_config, &cgid_module); 
 
-    signal(SIGCHLD, SIG_IGN); 
+    ap_signal(SIGCHLD, SIG_IGN); 
     unlink(sconf->sockname); 
 
     if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 6272d4c15e8..421f1967ebb 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3409,7 +3409,7 @@ static int rewritemap_program_child(ap_context_t *p, char *progname,
     ap_block_alarms();
 
 #ifdef SIGHUP
-    signal(SIGHUP, SIG_IGN);
+    ap_signal(SIGHUP, SIG_IGN);
 #endif