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 da2f6959f48f9c168049f8c6252d087bf8a7929b..8a5c7fca29b17d11aa545c90f0face8ecaa95987 100644 (file)
--- 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 cbeed863b8c3f4f5fb96f860abe755a874c6de4b..7f78ebc1b3e39f53f1a84ca7d86ee1d8d72220fc 100644 (file)
--- 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 6272d4c15e82322f298714cfdbe452798fa28e62..421f1967ebb0e6aaf35c214b0b13eb02d5d7aa1a 100644 (file)
--- 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