diff -ru nginx-1.0.5-orig/auto/make nginx-1.0.5-fixed/auto/make
|
a
|
b
|
|
| 188 | 188 | cat << END >> $NGX_MAKEFILE |
| 189 | 189 | |
| 190 | 190 | $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer |
| 191 | | \$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link |
| | 191 | \$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link -lrt |
| 192 | 192 | $ngx_rcc |
| 193 | 193 | ${ngx_long_end} |
| 194 | 194 | END |
diff -ru nginx-1.0.5-orig/src/os/unix/ngx_time.c nginx-1.0.5/src/os/unix/ngx_time.c
|
a
|
b
|
|
| 101 | 99 | |
| 102 | 100 | #endif |
| 103 | 101 | } |
| | 102 | |
| | 103 | void |
| | 104 | ngx_gettimeofday(struct timeval *tv) |
| | 105 | { |
| | 106 | struct timespec ts; |
| | 107 | |
| | 108 | (void) clock_gettime(CLOCK_MONOTONIC, &ts); |
| | 109 | |
| | 110 | tv->tv_sec = ts.tv_sec; |
| | 111 | tv->tv_usec = ts.tv_nsec / 1000; |
| | 112 | } |
| | 113 | |
diff -ru nginx-1.0.5-orig/src/os/unix/ngx_time.h nginx-1.0.5/src/os/unix/ngx_time.h
|
a
|
b
|
|
| 56 | 55 | void ngx_localtime(time_t s, ngx_tm_t *tm); |
| 57 | 56 | void ngx_libc_localtime(time_t s, struct tm *tm); |
| 58 | 57 | void ngx_libc_gmtime(time_t s, struct tm *tm); |
| | 58 | void ngx_gettimeofday(struct timeval *tv); |
| 59 | 59 | |
| 60 | | #define ngx_gettimeofday(tp) (void) gettimeofday(tp, NULL); |
| 61 | 60 | #define ngx_msleep(ms) (void) usleep(ms * 1000) |
| 62 | 61 | #define ngx_sleep(s) (void) sleep(s) |
| 63 | 62 | |