Received: by taz.hyperreal.com (8.8.4/V2.0) id DAA14399;
 Mon, 17 Feb 1997 03:05:07 -0800 (PST)
Received: by taz.hyperreal.com (8.8.4/V2.0) id DAA14392;
 Mon, 17 Feb 1997 03:05:04 -0800 (PST)
Date: Mon, 17 Feb 1997 03:05:04 -0800 (PST)
From: Marc Slemko <marc@hyperreal.com>
Message-Id: <199702171105.DAA14392@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src buff.c conf.h http_main.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

marc        97/02/17 03:05:03

  Modified:    src       buff.c conf.h http_main.c
  Log:
  Add <bstring.h> include for IRIX; FD_ZERO uses bzero, which is
  prototyped in bstring.h.
  
  Don't use killpg();  part of the IRIX -D_BSD_COMPAT functionality,
  and since the rest of apache doesn't use -D_BSD_COMPAT it probably
  shouldn't use killpg().
  
  Note that HAVE_BSTRING_H may not be the best name for the define.
  
  Reviewed by: Marc Slemko, Jim Jagielski
  Submitted by: Dean Gaudet
  
  Revision  Changes    Path
  1.20      +4 -0      apache/src/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/buff.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** buff.c	1997/02/15 18:34:27	1.19
  --- buff.c	1997/02/17 11:05:01	1.20
  ***************
  *** 65,70 ****
  --- 65,74 ----
    #include "alloc.h"
    #include "buff.h"
    
  + #ifdef HAVE_BSTRING_H
  + #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
  + #endif
  + 
    #define DEFAULT_BUFSIZE (4096)
    
    /*
  
  
  
  1.79      +4 -1      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -C3 -r1.78 -r1.79
  *** conf.h	1997/02/10 21:22:20	1.78
  --- conf.h	1997/02/17 11:05:01	1.79
  ***************
  *** 102,114 ****
    
    #elif defined(IRIX)
    #undef HAVE_GMTOFF
  ! #undef NO_KILLPG
    #undef NO_SETSID
    #define JMP_BUF sigjmp_buf
    #define USE_FCNTL_SERIALIZED_ACCEPT
    #define HAVE_SHMGET
    #define HAVE_CRYPT_H
    #define NO_LONG_DOUBLE
    
    #elif defined(HIUX)
    #define HAVE_SYS_RESOURCE_H
  --- 102,117 ----
    
    #elif defined(IRIX)
    #undef HAVE_GMTOFF
  ! /* IRIX has killpg, but it's only in _BSD_COMPAT, so don't use it in case
  !  * there's some weird conflict with non-BSD signals */
  ! #define NO_KILLPG
    #undef NO_SETSID
    #define JMP_BUF sigjmp_buf
    #define USE_FCNTL_SERIALIZED_ACCEPT
    #define HAVE_SHMGET
    #define HAVE_CRYPT_H
    #define NO_LONG_DOUBLE
  + #define HAVE_BSTRING_H
    
    #elif defined(HIUX)
    #define HAVE_SYS_RESOURCE_H
  
  
  
  1.122     +4 -0      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -C3 -r1.121 -r1.122
  *** http_main.c	1997/02/16 23:32:32	1.121
  --- http_main.c	1997/02/17 11:05:02	1.122
  ***************
  *** 100,105 ****
  --- 100,109 ----
    #endif
    #include <netinet/tcp.h>
    
  + #ifdef HAVE_BSTRING_H
  + #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
  + #endif
  + 
    #include "explain.h"
    
    #if !defined(max)