aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2003-07-23 20:01:29 +0000
committerIgor Sysoev <igor@sysoev.ru>2003-07-23 20:01:29 +0000
commitbc6f9f2359ad59e04b9a178331d99dfce7d1ab93 (patch)
tree0e3e94c9528f6f8f8f417e56fc6ac188754512d8
parent3a081188dc70608b9970eca5ad28c134e4f60f0b (diff)
downloadnginx-bc6f9f2359ad59e04b9a178331d99dfce7d1ab93.tar.gz
nginx-bc6f9f2359ad59e04b9a178331d99dfce7d1ab93.zip
nginx-0.0.1-2003-07-24-00:01:29 import
-rw-r--r--src/core/ngx_connection.h6
-rw-r--r--src/core/ngx_log.c2
-rw-r--r--src/os/win32/ngx_files.c2
-rw-r--r--src/os/win32/ngx_win32_config.h1
4 files changed, 6 insertions, 5 deletions
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 6211c5f5c..f7fa3f3fe 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -127,9 +127,9 @@ cached file
size_t size;
time_t mod;
- char *last_mod; 'Sun, 17 Mar 2002 19:39:50 GMT'
- char *etag; '"a6d08-1302-3c94f106"'
- char *len; '4866'
+ char *last_mod; "Sun, 17 Mar 2002 19:39:50 GMT"
+ char *etag; ""a6d08-1302-3c94f106""
+ char *len; "4866"
EV_VNODE should notify by some signal if diretory tree is changed
or stat if aged >= N seconds (big enough)
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 9f422d3af..8bda9e927 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -66,7 +66,7 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
va_list args;
#endif
#if (WIN32)
- int written;
+ u_int written;
#endif
if (log->file->fd == NGX_INVALID_FILE) {
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 3734bdc83..7c3b1f6d4 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -18,7 +18,7 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
}
-int ngx_file_append_mode(ngx_fd_t *fd)
+int ngx_file_append_mode(ngx_fd_t fd)
{
if (SetFilePointer(fd, 0, NULL, FILE_END) == 0xFFFFFFFF) {
if (GetLastError() != NO_ERROR) {
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index ab0507437..96cf000ee 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -9,6 +9,7 @@
#include <mswsock.h>
#include <stddef.h> /* offsetof */
#include <stdio.h>
+#include <stdlib.h>
#include <stdarg.h>
#include <time.h> /* gmtime, strftime */