sascha 99/12/30 20:15:14
Modified: src/lib/apr acconfig.h
src/lib/apr/lib apr_signal.c
src/lib/apr/test htdigest.c htpasswd.c
src/lib/apr/threadproc/os2 proc.c
src/lib/apr/threadproc/unix proc.c
Log:
Use always ap_signal() in APR to avoid redefining the system call signal()
Revision Changes Path
1.19 +3 -2 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- acconfig.h 1999/12/22 20:29:16 1.18
+++ acconfig.h 1999/12/31 04:15:08 1.19
@@ -61,12 +61,13 @@
#ifdef HAVE_SIGACTION
typedef void Sigfunc(int);
-#define signal(s,f) ap_signal(s, f)
-Sigfunc *signal(int signo, Sigfunc * func);
+Sigfunc *ap_signal(int signo, Sigfunc * func);
#if defined(SIG_ING) && !defined(SIG_ERR)
#define SIG_ERR ((Sigfunc *)-1)
#endif
+#else
+#define ap_signal(a,b) signal(a,b)
#endif
#if !defined(HAVE_PTHREAD_SIGMASK) && defined(_AIX)
1.4 +1 -1 apache-2.0/src/lib/apr/lib/apr_signal.c
Index: apr_signal.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- apr_signal.c 1999/12/01 18:39:35 1.3
+++ apr_signal.c 1999/12/31 04:15:08 1.4
@@ -67,7 +67,7 @@
* from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
* (the version that does not automatically restart system calls).
*/
-Sigfunc *signal(int signo, Sigfunc * func)
+Sigfunc *ap_signal(int signo, Sigfunc * func)
{
struct sigaction act, oact;
1.12 +1 -1 apache-2.0/src/lib/apr/test/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- htdigest.c 1999/12/20 19:44:42 1.11
+++ htdigest.c 1999/12/31 04:15:10 1.12
@@ -209,7 +209,7 @@
ap_create_context(&cntxt, NULL);
tn = NULL;
- signal(SIGINT, (void (*)(int)) interrupted);
+ ap_signal(SIGINT, (void (*)(int)) interrupted);
if (argc == 5) {
if (strcmp(argv[1], "-c"))
usage();
1.2 +1 -1 apache-2.0/src/lib/apr/test/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htpasswd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- htpasswd.c 1999/08/17 15:59:48 1.1
+++ htpasswd.c 1999/12/31 04:15:11 1.2
@@ -328,7 +328,7 @@
int args_left = 2;
tempfilename = NULL;
- signal(SIGINT, (void (*)(int)) interrupted);
+ ap_signal(SIGINT, (void (*)(int)) interrupted);
/*
* Preliminary check to make sure they provided at least
1.12 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- proc.c 1999/12/19 08:33:52 1.11
+++ proc.c 1999/12/31 04:15:12 1.12
@@ -247,7 +247,7 @@
DosSetFHState(attr->parent_err->filedes, OPEN_FLAGS_NOINHERIT);
}
- signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
+ ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
if (attr->currdir != NULL) {
_getcwd2(savedir, sizeof(savedir));
1.14 +1 -1 apache-2.0/src/lib/apr/threadproc/unix/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- proc.c 1999/12/03 15:18:37 1.13
+++ proc.c 1999/12/31 04:15:13 1.14
@@ -355,7 +355,7 @@
ap_close(attr->child_err);
}
- signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
+ ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
if (attr->currdir != NULL) {
if (chdir(attr->currdir) == -1) {
