1 files changed, 19 insertions, 21 deletions
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h
index d3d176fda..63a0ad9f7 100644
--- a/src/os/unix/ngx_time.h
+++ b/src/os/unix/ngx_time.h
@@ -12,33 +12,31 @@
 #include <ngx_core.h>
 
 
-typedef uint64_t       ngx_epoch_msec_t;
+typedef ngx_rbtree_key_t  ngx_msec_t;
 
-typedef ngx_int_t      ngx_msec_t;
+typedef struct tm         ngx_tm_t;
 
-typedef struct tm      ngx_tm_t;
+#define ngx_tm_sec        tm_sec
+#define ngx_tm_min        tm_min
+#define ngx_tm_hour       tm_hour
+#define ngx_tm_mday       tm_mday
+#define ngx_tm_mon        tm_mon
+#define ngx_tm_year       tm_year
+#define ngx_tm_wday       tm_wday
+#define ngx_tm_isdst      tm_isdst
 
-#define ngx_tm_sec     tm_sec
-#define ngx_tm_min     tm_min
-#define ngx_tm_hour    tm_hour
-#define ngx_tm_mday    tm_mday
-#define ngx_tm_mon     tm_mon
-#define ngx_tm_year    tm_year
-#define ngx_tm_wday    tm_wday
-#define ngx_tm_isdst   tm_isdst
-
-#define ngx_tm_sec_t   int
-#define ngx_tm_min_t   int
-#define ngx_tm_hour_t  int
-#define ngx_tm_mday_t  int
-#define ngx_tm_mon_t   int
-#define ngx_tm_year_t  int
-#define ngx_tm_wday_t  int
+#define ngx_tm_sec_t      int
+#define ngx_tm_min_t      int
+#define ngx_tm_hour_t     int
+#define ngx_tm_mday_t     int
+#define ngx_tm_mon_t      int
+#define ngx_tm_year_t     int
+#define ngx_tm_wday_t     int
 
 
 #if (NGX_HAVE_GMTOFF)
-#define ngx_tm_gmtoff  tm_gmtoff
-#define ngx_tm_zone    tm_zone
+#define ngx_tm_gmtoff     tm_gmtoff
+#define ngx_tm_zone       tm_zone
 #endif