diff options
Diffstat (limited to '')
| -rw-r--r-- | src/os/win32/ngx_files.h | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_time.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_time.h | 6 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index 0565eafa6..7692585c2 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -52,6 +52,10 @@ int ngx_file_append_mode(ngx_fd_t fd); #define ngx_close_file CloseHandle #define ngx_close_file_n "CloseHandle()" +/* STUB */ +#define ngx_rename_file MoveFile +#define ngx_rename_file_n "MoveFile()" + #define ngx_mkdir(name) CreateDirectory(name, NULL) #define ngx_mkdir_n "CreateDirectory()" diff --git a/src/os/win32/ngx_time.c b/src/os/win32/ngx_time.c index 8497c538d..0aa2c5e74 100644 --- a/src/os/win32/ngx_time.c +++ b/src/os/win32/ngx_time.c @@ -24,6 +24,6 @@ void ngx_gettimeofday(struct timeval *tp) intervals = ((uint64_t) ft.dwHighDateTime << 32) | ft.dwLowDateTime; intervals -= 116444736000000000; - tp->tv_sec = intervals / 10000000; - tp->tv_usec = (intervals % 10000000) / 10; + tp->tv_sec = (long) (intervals / 10000000); + tp->tv_usec = (long) ((intervals % 10000000) / 10); } diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h index 36f8918fa..a40dfb454 100644 --- a/src/os/win32/ngx_time.h +++ b/src/os/win32/ngx_time.h @@ -27,12 +27,6 @@ typedef FILETIME ngx_mtime_t; #define ngx_localtime GetLocalTime -struct timeval { - long tv_sec; - long tv_usec; -}; - - void ngx_gettimeofday(struct timeval *tp); diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 74769befd..c72aaffc9 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -36,6 +36,7 @@ typedef unsigned __int64 off_t; #define SIZE_FMT "%d" #define SIZEX_FMT "%x" #define PID_FMT "%d" +#define TIME_FMT "%lu" /* STUB */ |
