nginx-0.0.3-2004-03-17-00:26:01 import

src/core/ngx_conf_file.h

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 8b4aa49..ee90855 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -212,7 +212,7 @@
             conf.data = prev.data;                                           \
         } else {                                                             \
             conf.len = sizeof(default) - 1;                                  \
-            conf.data = default;                                             \
+            conf.data = (u_char *) default;                                  \
         }                                                                    \
     }
 

src/core/ngx_file.c

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index cbb1cb2..48cff46 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -57,24 +57,10 @@
         ngx_create_hashed_filename(file, path);
 
 #if 0
-#if (WIN32)
-        file->fd = CreateFile(file->name.data,
-                        GENERIC_READ|GENERIC_WRITE,
-                        FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-                        NULL,
-                        CREATE_NEW,
-                        persistent ? 0:
-                            FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE,
-                        NULL);
-#else
-        file->fd = open(file->name.data, O_CREAT|O_EXCL|O_WRONLY, 0600);
-#endif
-#endif
-
-#if 0
         file->fd = ngx_open_tempfile(file->name.data, persistent);
-#endif
+#else
         file->fd = ngx_open_tempfile(file->name.data, 1);
+#endif
 
         ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
                        "temp fd:%d", file->fd);

src/core/ngx_file.h

diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index 6afe1d1..db46d54 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -61,7 +61,7 @@
         if (prev == NULL) {                                                  \
             ngx_test_null(conf, ngx_palloc(pool, sizeof(ngx_path_t)), NULL); \
             conf->name.len = sizeof(path) - 1;                               \
-            conf->name.data = path;                                          \
+            conf->name.data = (u_char *) path;                               \
             conf->level[0] = l1;                                             \
             conf->level[1] = l2;                                             \
             conf->level[2] = l3;                                             \

src/core/ngx_string.h

diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 84110b9..09de18e 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -18,8 +18,10 @@
 
 #if (WIN32)
 
-#define ngx_strncasecmp           strnicmp
-#define ngx_strcasecmp            stricmp
+#define ngx_strncasecmp(s1, s2, n)                                           \
+                          strnicmp((const char *) s1, (const char *) s2, n)
+#define ngx_strcasecmp(s1, s2)                                               \
+                          stricmp((const char *) s1, (const char *) s2)
 
 #define ngx_snprintf              _snprintf
 #define ngx_vsnprintf             _vsnprintf