httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@gonzo.ben.algroup.co.uk>
Subject [PATCH] fix multiply defined signal()
Date Sat, 26 Apr 1997 12:39:12 GMT
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.93
diff -c -r1.93 conf.h
*** conf.h	1997/04/15 20:00:21	1.93
--- conf.h	1997/04/26 12:41:38
***************
*** 639,644 ****
--- 639,658 ----
  #define INADDR_NONE ((unsigned long) -1)
  #endif
  
+ /*
+  * 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
+ 
+ #define signal(s,f)	ap_signal(s,f)
+ Sigfunc *signal(int signo, Sigfunc *func);
+ #endif
+ 
  /* Finding offsets of elements within structures.
   * Taken from the X code... they've sweated portability of this stuff
   * so we don't have to.  Sigh...
Index: http_main.h
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.h,v
retrieving revision 1.9
diff -c -r1.9 http_main.h
*** http_main.h	1997/04/21 20:29:07	1.9
--- http_main.h	1997/04/26 12:41:39
***************
*** 97,112 ****
  int count_busy_servers ();
  int count_idle_servers ();
  
- /*
-  * 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
- 
- Sigfunc *signal(int signo, Sigfunc *func);
- #endif
- 
--- 97,99 ----

-- 
** Buy "Apache: The Definitive Guide" from http://www.links.org/apache **
Ben Laurie                Phone: +44 (181) 994 6435  Email: ben@algroup.co.uk
Freelance Consultant and  Fax:   +44 (181) 994 6472
Technical Director        URL: http://www.algroup.co.uk/Apache-SSL
A.L. Digital Ltd,         Apache Group member (http://www.apache.org)
London, England.          Apache-SSL author

Mime
View raw message