cvs commit: apachen/src/main buff.h conf.h util_script.c

[Dean Gaudet <dg...@hyperreal.org>]

dgaudet     97/09/15 20:49:59

  Modified:    src/main buff.h conf.h util_script.c
  Log:
  A few portability fixes from Martin back on Aug 27/97.
  
  Submitted by:	Martin Kraemer
  Reviewed by:	Dean Gaudet
  
  Revision  Changes    Path
  1.25      +3 -0      apachen/src/main/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/buff.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- buff.h	1997/09/14 11:13:53	1.24
  +++ buff.h	1997/09/16 03:49:55	1.25
  @@ -69,6 +69,9 @@
   #define B_RDERR (16)
   /* A write error has occurred */
   #define B_WRERR (32)
  +#ifdef B_ERROR  /* in SVR4: sometimes defined in /usr/include/sys/buf.h */
  +#undef B_ERROR
  +#endif
   #define B_ERROR (48)
   /* Use chunked writing */
   #define B_CHUNK (64)
  
  
  
  1.141     +3 -0      apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- conf.h	1997/09/16 03:44:29	1.140
  +++ conf.h	1997/09/16 03:49:56	1.141
  @@ -395,6 +395,9 @@
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define HAVE_SYSLOG
  +#ifdef SNI  /* SINIX/ReliantUNIX, probably other SVR4's as well */
  +#define NET_SIZE_T size_t
  +#endif /*SNI*/
   
   #elif defined(UW)
   #define NO_LINGCLOSE
  
  
  
  1.74      +2 -1      apachen/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- util_script.c	1997/09/14 22:18:59	1.73
  +++ util_script.c	1997/09/16 03:49:57	1.74
  @@ -499,7 +499,8 @@
   {
       char ss[20];
   
  -    if (size == -1)
  +    /* XXX: this -1 thing is a gross hack */
  +    if (size == (size_t)-1)
   	strcpy(ss, "    -");
       else if (!size)
   	strcpy(ss, "   0k");