httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.com>
Subject cvs commit: apache/src/modules Makefile
Date Sat, 26 Apr 1997 20:20:08 GMT
ben         97/04/26 13:20:07

  Modified:    src       conf.h http_main.h
               src/modules  Makefile
  Log:
  Fix multiply defined signal().
  
  Reviewed by: Randy, Dean.
  
  Revision  Changes    Path
  1.94      +14 -0     apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -C3 -r1.93 -r1.94
  *** conf.h	1997/04/15 20:00:21	1.93
  --- conf.h	1997/04/26 20:20:06	1.94
  ***************
  *** 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...
  
  
  
  1.10      +0 -13     apache/src/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** http_main.h	1997/04/21 20:29:07	1.9
  --- http_main.h	1997/04/26 20:20:06	1.10
  ***************
  *** 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 ----
  
  
  
  1.9       +24 -65    apache/src/modules/Attic/Makefile
  
  
  
  

Mime
View raw message