cvs commit: apache/src conf.h util.c

[Brian Behlendorf <br...@hyperreal.com>]

brian       96/11/18 11:56:32

  Modified:    src       conf.h util.c
  Log:
  Reviewed by:	Dead Gaudet, Brian Behlendorf
  Submitted by:	Roy Fielding
  
  Anticipate lack of definition for INADDR_NONE in a platform-independent
  way.
  
  Revision  Changes    Path
  1.44      +4 -0      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -C3 -r1.43 -r1.44
  *** conf.h	1996/11/14 07:24:41	1.43
  --- conf.h	1996/11/18 19:56:28	1.44
  ***************
  *** 457,462 ****
  --- 457,466 ----
    #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
    #endif
    
  + #ifndef INADDR_NONE
  + #define INADDR_NONE ((unsigned long) -1)
  + #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.32      +1 -1      apache/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -C3 -r1.31 -r1.32
  *** util.c	1996/11/14 07:24:44	1.31
  --- util.c	1996/11/18 19:56:29	1.32
  ***************
  *** 1170,1176 ****
    #else
        my_addr = inet_addr(w);
    #endif
  !     if (my_addr != (~0ul))
        {
    	if (p != NULL) *p = ':';
    	return my_addr;
  --- 1170,1176 ----
    #else
        my_addr = inet_addr(w);
    #endif
  !     if (my_addr != INADDR_NONE)
        {
    	if (p != NULL) *p = ':';
    	return my_addr;