diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-06-17 17:18:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-06-17 17:18:53 +0000 |
| commit | 415b1ce1b93a3b74efe8a3ee5a35ee55e0a11caa (patch) | |
| tree | 077bf24b4f310a87ab8bff140c730cb679069988 /src/os/unix/ngx_time.h | |
| parent | f924e6b694db7fd1d99473b3d7db7eb2b49c9e62 (diff) | |
| download | nginx-415b1ce1b93a3b74efe8a3ee5a35ee55e0a11caa.tar.gz nginx-415b1ce1b93a3b74efe8a3ee5a35ee55e0a11caa.zip | |
nginx-0.0.7-2004-06-17-21:18:53 import
Diffstat (limited to 'src/os/unix/ngx_time.h')
| -rw-r--r-- | src/os/unix/ngx_time.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h index dbb7a0a54..7cf3d01af 100644 --- a/src/os/unix/ngx_time.h +++ b/src/os/unix/ngx_time.h @@ -9,7 +9,6 @@ typedef uint64_t ngx_epoch_msec_t; typedef ngx_int_t ngx_msec_t; -#define NGX_MAX_MSEC (ngx_msec_t) -1 typedef struct tm ngx_tm_t; @@ -20,11 +19,7 @@ typedef struct tm ngx_tm_t; #define ngx_tm_mon tm_mon #define ngx_tm_year tm_year #define ngx_tm_wday tm_wday -#define ngx_tm_gmtoff tm_gmtoff - -#ifndef SOLARIS -#define ngx_tm_zone tm_zone -#endif +#define ngx_tm_isdst tm_isdst #define ngx_tm_sec_t int #define ngx_tm_min_t int @@ -35,16 +30,14 @@ typedef struct tm ngx_tm_t; #define ngx_tm_wday_t int -#if (SOLARIS) -#define HAVE_TIMEZONE 1 - -#define ngx_timezone() (- (daylight ? altzone : timezone) / 60) - -#elif defined __linux__ -#define HAVE_TIMEZONE 1 +#if (HAVE_GMTOFF) +#define ngx_tm_gmtoff tm_gmtoff +#define ngx_tm_zone tm_zone +#endif -#define ngx_timezone() (- timezone / 60 + daylight * 60) +#if (SOLARIS) +#define ngx_timezone(isdst) (- (isdst ? altzone : timezone) / 60) #endif |