2 files changed, 1 insertions, 52 deletions
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 7a19d1b71..84b0a6d05 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -30,7 +30,7 @@ typedef struct ngx_connection_s  ngx_connection_t;
 #include <ngx_times.h>
 #include <ngx_inet.h>
 #include <ngx_conf_file.h>
-#include <ngx_os_init.h>
+#include <ngx_os.h>
 #include <ngx_connection.h>
 
 
diff --git a/src/core/ngx_os_init.h b/src/core/ngx_os_init.h
deleted file mode 100644
index e10a07de6..000000000
--- a/src/core/ngx_os_init.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _NGX_OS_INIT_H_INCLUDED_
-#define _NGX_OS_INIT_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-#define NGX_IO_SENDFILE    1
-#define NGX_IO_ZEROCOPY    2
-
-#if (HAVE_SENDFILE)
-#define NGX_HAVE_SENDFILE  NGX_IO_SENDFILE
-#else
-#define NGX_HAVE_SENDFILE  0
-#endif
-
-#if (HAVE_ZEROCOPY)
-#define NGX_HAVE_ZEROCOPY  NGX_IO_ZEROCOPY
-#else
-#define NGX_HAVE_ZEROCOPY  0
-#endif
-
-
-
-typedef struct {
-    ssize_t       (*recv)(ngx_connection_t *c, char *buf, size_t size);
-    ssize_t       (*recv_chain)(ngx_connection_t *c, ngx_chain_t *in);
-    ssize_t       (*send)(ngx_connection_t *c, char *buf, size_t size);
-    ngx_chain_t  *(*send_chain)(ngx_connection_t *c, ngx_chain_t *in);
-    int             flags;
-} ngx_os_io_t;
-
-
-int ngx_os_init(ngx_log_t *log);
-
-#if !(WIN32)
-int ngx_daemon(ngx_log_t *log);
-#endif
-
-
-extern ngx_os_io_t  ngx_os_io;
-extern int          ngx_max_sockets;
-extern int          ngx_inherited_nonblocking;
-
-
-extern int          restart;
-extern int          rotate;
-
-
-#endif /* _NGX_OS_INIT_H_INCLUDED_ */