apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: apr/time/unix time.c
Date Tue, 17 Apr 2001 02:20:19 GMT
bjh         01/04/16 19:20:19

  Modified:    time/unix time.c
  Log:
  Fix OS/2 build where we have no gmtime_r (or an *_r's for that matter) or
  tm_gmtoff.
  
  Revision  Changes    Path
  1.41      +10 -1     apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apr/time/unix/time.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- time.c	2001/04/14 22:02:04	1.40
  +++ time.c	2001/04/17 02:20:19	1.41
  @@ -95,7 +95,11 @@
       {
           struct tm t;
           int days = 0, hours = 0, minutes = 0;
  +#ifdef HAVE_GMTIME_R
           gmtime_r(tt, &t);
  +#else
  +        t = *gmtime(tt);
  +#endif
           days = xt->tm_yday - t.tm_yday;
           hours = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) +
                    xt->tm_hour - t.tm_hour);
  @@ -145,6 +149,10 @@
   
   apr_status_t apr_explode_localtime(apr_exploded_time_t *result, apr_time_t input)
   {
  +#if defined(__EMX__)
  +    /* EMX gcc (OS/2) has a timezone global we can use */
  +    return apr_explode_time(result, input, -timezone);
  +#else
       time_t mango = input / APR_USEC_PER_SEC;
       apr_int32_t offs = 0;
   
  @@ -163,6 +171,7 @@
       offs = mangotm->tm_gmtoff;
   #endif
       return apr_explode_time(result, input, offs);
  +#endif /* __EMX__ */
   }
   
   apr_status_t apr_implode_time(apr_time_t *t, apr_exploded_time_t *xt)
  @@ -246,7 +255,7 @@
   {
   #ifdef OS2
       DosSleep(t/1000);
  -#elseif defined(BEOS)
  +#elif defined(BEOS)
       snooze(t);
   #else
       struct timeval tv;
  
  
  

Mime
View raw message