nginx-0.0.1-2003-11-09-23:03:38 import; separate building

5 files changed, 28 insertions, 45 deletions

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index a23c0e2a0..a29e333cc 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -6,7 +6,7 @@
 #include <ngx_core.h>
 
 
-/* INVALID_FILE_ATTRIBUTES specified but never defined at least in VC6SP2 */
+/* INVALID_FILE_ATTRIBUTES specified but not defined at least in MSVC6SP2 */
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES     0xFFFFFFFF
 #endif
@@ -67,6 +67,7 @@ int ngx_file_type(char *filename, ngx_file_info_t *fi);
 #define ngx_file_size(fi)                                                   \
             (((off_t) fi.nFileSizeHigh << 32) | fi.nFileSizeLow)
 
+#define ngx_file_uniq(fi)   (*(ngx_file_uniq_t *) &fi.nFileIndexHigh)
 
 /* There are 134774 days between 1 Jan 1970 and 1 Jan 1601,
    11644473600 seconds or 11644473600,000,000,0 100-nanosecond intervals */
diff --git a/src/os/win32/ngx_stat.c b/src/os/win32/ngx_stat.c
index 81559bc31..786bc7f38 100644
--- a/src/os/win32/ngx_stat.c
+++ b/src/os/win32/ngx_stat.c
@@ -1,7 +1,7 @@
 
 #include <ngx_config.h>
+#include <ngx_core.h>
 
-#include <ngx_stat.h>
 
 int ngx_file_type(char *file, ngx_file_info_t *sb)
 {
diff --git a/src/os/win32/ngx_stat.h b/src/os/win32/ngx_stat.h
deleted file mode 100644
index bd0423b29..000000000
--- a/src/os/win32/ngx_stat.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _NGX_STAT_H_INCLUDED_
-#define _NGX_STAT_H_INCLUDED_
-
-
-#include <windows.h>
-
-/* INVALID_FILE_ATTRIBUTES specified but never defined at least in VC6SP2 */
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES  0xFFFFFFFF
-#endif
-
-typedef BY_HANDLE_FILE_INFORMATION  ngx_file_info_t;
-
-
-#define ngx_file_type_n          "GetFileAttributes"
-
-#define ngx_is_dir(fi)          (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-
-#define ngx_stat_n               "GetFileAttributes"
-
-#define ngx_fstat(file, fd, sb)  ngx_stat(file, sb)
-#define ngx_fstat_n              "GetFileAttributes"
-
-
-/*
-int ngx_stat(char *file, ngx_stat_t *sb);
-*/
-
-
-#endif /* _NGX_STAT_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h
index 59ee72173..043265536 100644
--- a/src/os/win32/ngx_types.h
+++ b/src/os/win32/ngx_types.h
@@ -6,21 +6,9 @@
 #include <ngx_core.h>
 
 
-typedef unsigned __int32            u_int32_t;
-typedef __int64                     int64_t;
-
-typedef int                         ssize_t;
-typedef long                        time_t;
-
 typedef HANDLE                      ngx_fd_t;
-typedef unsigned __int64            off_t;
 typedef BY_HANDLE_FILE_INFORMATION  ngx_file_info_t;
-
-
-#define OFF_FMT    "%I64d"
-#define SIZE_FMT   "%d"
-#define SIZEX_FMT  "%x"
-#define PID_FMT    "%d"
+typedef uint64_t                    ngx_file_uniq_t;
 
 
 #endif /* _NGX_TYPES_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 7d123d71c..74769befd 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -18,6 +18,30 @@
 #define ngx_inline   __inline
 
 
+#if 0
+typedef unsigned __int32  uint32_t;
+#else
+typedef unsigned int      uint32_t;
+#endif
+typedef __int64           int64_t;
+typedef unsigned __int64  uint64_t;
+typedef u_int             uintptr_t;
+
+typedef int               ssize_t;
+typedef long              time_t;
+typedef unsigned __int64  off_t;
+
+
+#define OFF_FMT    "%I64d"
+#define SIZE_FMT   "%d"
+#define SIZEX_FMT  "%x"
+#define PID_FMT    "%d"
+
+
+/* STUB */
+typedef uint32_t     u_int32_t;
+
+
 #ifndef HAVE_INHERITED_NONBLOCK
 #define HAVE_INHERITED_NONBLOCK  1
 #endif