You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Dean Gaudet <dg...@hyperreal.org> on 1997/07/27 03:21:44 UTC

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

dgaudet     97/07/26 18:21:43

  Modified:    src       mod_status.c util.c conf.h
  Log:
  Move difftime() defn from mod_status.c to util.c, and test NEED_DIFFTIME.
  Only SUNOS4 uses NEED_DIFFTIME.
  
  Revision  Changes    Path
  1.55      +0 -9      apache/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_status.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_status.c	1997/07/24 04:32:29	1.54
  +++ mod_status.c	1997/07/27 01:21:40	1.55
  @@ -157,15 +157,6 @@
   	rprintf(r," %ld second%s",secs,secs==1?"":"s");
   }
   
  -#if defined(SUNOS4)
  -double
  -difftime(time1, time0)
  -        time_t time1, time0;
  -{   
  -        return(time1 - time0);
  -}   
  -#endif
  -    
   /* Main handler for x-httpd-status requests */
   
   /* ID values for command table */
  
  
  
  1.65      +7 -0      apache/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- util.c	1997/07/21 05:53:52	1.64
  +++ util.c	1997/07/27 01:21:40	1.65
  @@ -1421,3 +1421,10 @@
   #endif
   }
   #endif /* NO_SLACK */
  +
  +#if defined(NEED_DIFFTIME)
  +double difftime(time_t time1, time_t time0)
  +{
  +        return(time1 - time0);
  +}
  +#endif
  
  
  
  1.118     +1 -0      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- conf.h	1997/07/24 04:35:46	1.117
  +++ conf.h	1997/07/27 01:21:41	1.118
  @@ -91,6 +91,7 @@
   #define memmove(a,b,c) bcopy(b,a,c)
   #define NO_LINGCLOSE
   #define USE_FLOCK_SERIALIZED_ACCEPT
  +#define NEED_DIFFTIME
   
   #elif defined(SOLARIS2)
   #undef HAVE_GMTOFF