nginx-0.0.2-2004-03-16-10:10:12 import

6 files changed, 44 insertions, 21 deletions

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index df0d865c1..ffc09b6ed 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -3,10 +3,10 @@
 #include <ngx_core.h>
 
 
-ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
+ssize_t ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
 {
     long        high_offset;
-    DWORD       n;
+    u_long      n;
     ngx_err_t   err;
     OVERLAPPED  ovlp, *povlp;
 
@@ -20,8 +20,9 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
         if (file->offset != offset) {
 
             /*
-             * the maximum file size on FAT16 is 2G, but on FAT32 it's 4G so we
-             * need to use high_offset because a single offset is signed value
+             * the maximum file size on FAT16 is 2G, but on FAT32
+             * the size is 4G so we need to use high_offset
+             * because a single offset is signed value
              */
 
             high_offset = (long) (offset >> 32);
@@ -47,8 +48,8 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
     } else {
         ovlp.Internal = 0;
         ovlp.InternalHigh = 0;
-        ovlp.Offset = (DWORD) offset;
-        ovlp.OffsetHigh = (DWORD) (offset >> 32);
+        ovlp.Offset = (u_long) offset;
+        ovlp.OffsetHigh = (u_long) (offset >> 32);
         ovlp.hEvent = NULL;
 
         povlp = &ovlp;
@@ -65,10 +66,10 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
 }
 
 
-ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
+ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
 {
     long        high_offset;
-    DWORD       n;
+    u_long      n;
     ngx_err_t   err;
     OVERLAPPED  ovlp, *povlp;
 
@@ -82,8 +83,9 @@ ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
         if (file->offset != offset) {
 
             /*
-             * the maximum file size on FAT16 is 2G, but on FAT32 it's 4G so we
-             * need to use high_offset because a single offset is signed value
+             * the maximum file size on FAT16 is 2G, but on FAT32
+             * the size is 4G so we need to use high_offset
+             * because a single offset is signed value
              */
 
             high_offset = (long) (offset >> 32);
@@ -109,8 +111,8 @@ ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
     } else {
         ovlp.Internal = 0;
         ovlp.InternalHigh = 0;
-        ovlp.Offset = (DWORD) offset;
-        ovlp.OffsetHigh = (DWORD) (offset >> 32);
+        ovlp.Offset = (u_long) offset;
+        ovlp.OffsetHigh = (u_long) (offset >> 32);
         ovlp.hEvent = NULL;
 
         povlp = &ovlp;
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 1b13f4c7d..730ee71f8 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -23,7 +23,7 @@
 
 
 #define ngx_open_file(name, access, create)                                 \
-            CreateFile(name, access,                                        \
+            CreateFile((const char *) name, access,                         \
                        FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,  \
                        NULL, create, FILE_FLAG_BACKUP_SEMANTICS, NULL)
 /*
@@ -43,7 +43,7 @@ int ngx_file_append_mode(ngx_fd_t fd);
 
 
 #define ngx_open_tempfile(name, persistent)                                 \
-            CreateFile(name,                                                \
+            CreateFile((const char *) name,                                 \
                     GENERIC_READ|GENERIC_WRITE,                             \
                     FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,     \
                     NULL,                                                   \
@@ -139,10 +139,11 @@ int ngx_read_dir(ngx_dir_t *dir);
 
 
 
-ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
+ssize_t ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset);
 #define ngx_read_file_n             "ReadFile()"
 
-ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
+ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size,
+                       off_t offset);
 
 ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce,
                                 off_t offset, ngx_pool_t *pool);
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
index 7b26d6b35..929171055 100644
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -13,8 +13,14 @@ ngx_int_t     ngx_inherited;
 
 sig_atomic_t  ngx_reap;
 sig_atomic_t  ngx_timer;
+
+#endif
+
 sig_atomic_t  ngx_terminate;
 sig_atomic_t  ngx_quit;
+
+#if 0
+
 sig_atomic_t  ngx_noaccept;
 sig_atomic_t  ngx_reconfigure;
 sig_atomic_t  ngx_reopen;
@@ -23,6 +29,7 @@ sig_atomic_t  ngx_change_binary;
 #endif
 
 
+
 void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
 {
     ngx_int_t  i;
diff --git a/src/os/win32/ngx_process_cycle.h b/src/os/win32/ngx_process_cycle.h
index c863b6213..0c55afae8 100644
--- a/src/os/win32/ngx_process_cycle.h
+++ b/src/os/win32/ngx_process_cycle.h
@@ -8,7 +8,7 @@
 
 typedef struct {
      ngx_file_t    pid;
-     char         *name;
+     u_char       *name;
      int           argc;
      char *const  *argv;
 } ngx_master_ctx_t;
diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h
index a40dfb454..afffe6165 100644
--- a/src/os/win32/ngx_time.h
+++ b/src/os/win32/ngx_time.h
@@ -23,6 +23,15 @@ typedef FILETIME       ngx_mtime_t;
 #define ngx_tm_year    wYear
 #define ngx_tm_wday    wDayOfWeek
 
+#define ngx_tm_sec_t   u_short
+#define ngx_tm_min_t   u_short
+#define ngx_tm_hour_t  u_short
+#define ngx_tm_mday_t  u_short
+#define ngx_tm_mon_t   u_short
+#define ngx_tm_year_t  u_short
+#define ngx_tm_wday_t  u_short
+
+
 #define ngx_msleep     Sleep
 #define ngx_localtime  GetLocalTime
 
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 38cca91e5..3b3f71145 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -27,13 +27,17 @@
 #ifdef _MSC_VER
 #pragma warning(default:4201)
 
+/* disable some "-W4" level warnings */
+
+#pragma warning(disable:4054)
+#pragma warning(disable:4055)
 /* unreferenced formal parameter */
 #pragma warning(disable:4100)
-
-/* STUB */
-#if 0
 #pragma warning(disable:4127)
-#endif
+#pragma warning(disable:4214)
+#pragma warning(disable:4702)
+#pragma warning(disable:4706)
+
 #endif