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 CHANGES conf.h
Date Thu, 01 May 1997 17:36:27 GMT
ben         97/05/01 10:36:27

  Modified:    src       CHANGES conf.h
  Log:
  Fix problem with signal() redefinition on QNX (and perhaps others).
  Reviewed by: Randy, (someone else)
  
  Revision  Changes    Path
  1.263     +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.262
  retrieving revision 1.263
  diff -C3 -r1.262 -r1.263
  *** CHANGES	1997/04/30 23:01:56	1.262
  --- CHANGES	1997/05/01 17:36:23	1.263
  ***************
  *** 5,10 ****
  --- 5,13 ----
         body of the request, the server would block trying to read the
         message body again.  [Rob Hartill]
    
  +   *) signal() replacement conflicted with a define on QNX (and potentially
  +      other platforms). Fixed. [Ben Laurie] PR#512
  + 
    Changes with Apache 1.2b10
    
      *) Allow HTTPD_ROOT, SERVER_CONFIG_FILE, DEFAULT_PATH, and SHELL_PATH
  
  
  
  1.97      +6 -0      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -C3 -r1.96 -r1.97
  *** conf.h	1997/04/28 03:52:06	1.96
  --- conf.h	1997/05/01 17:36:24	1.97
  ***************
  *** 642,647 ****
  --- 642,653 ----
    #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
  
  
  

Mime
View raw message