nginx-0.0.1-2003-01-30-10:28:09 import
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index f0c324e..d35382f 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -2,14 +2,15 @@
#define _NGX_FILES_H_INCLUDED_
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <ngx_config.h>
-typedef int ngx_fd_t;
+#include <ngx_types.h>
+#include <ngx_file.h>
+
+
#define NGX_INVALID_FILE -1
#define NGX_FILE_ERROR -1
-typedef struct stat ngx_file_info_t;
#define ngx_open_file open
@@ -18,6 +19,7 @@
#define ngx_close_file close
#define ngx_close_file_n "close()"
+ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
#define ngx_read_file_n "read()"
#define NGX_FILE_RDONLY O_RDONLY
diff --git a/src/os/unix/ngx_types.h b/src/os/unix/ngx_types.h
index 9919e90..bf61ae2 100644
--- a/src/os/unix/ngx_types.h
+++ b/src/os/unix/ngx_types.h
@@ -4,6 +4,14 @@
#include <ngx_config.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+typedef int ngx_fd_t;
+typedef struct stat ngx_file_info_t;
+
+
#ifdef SOLARIS
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index f5e50cc..a8970a2 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -4,19 +4,18 @@
#include <ngx_config.h>
+#include <ngx_types.h>
+#include <ngx_file.h>
+
/* INVALID_FILE_ATTRIBUTES specified but never defined at least in VC6SP2 */
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
#endif
-typedef HANDLE ngx_fd_t;
#define NGX_INVALID_FILE INVALID_HANDLE_VALUE
#define NGX_FILE_ERROR 0
-typedef unsigned __int64 off_t;
-
-typedef BY_HANDLE_FILE_INFORMATION ngx_file_info_t;
#define ngx_open_file(name, flags) \
@@ -56,6 +55,7 @@
- 116444736000000000) / 10000000)
+ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
#define ngx_read_file_n "ReadFile()"
diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h
index c9e7415..d5f0d92 100644
--- a/src/os/win32/ngx_types.h
+++ b/src/os/win32/ngx_types.h
@@ -5,10 +5,15 @@
#include <ngx_config.h>
-typedef int ssize_t;
-typedef long time_t;
+typedef unsigned __int32 u_int32_t;
-typedef unsigned __int32 u_int32_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;
+
