nginx-0.0.7-2004-06-15-21:47:16 import

1 files changed, 23 insertions, 20 deletions

diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index 95cf54a34..2b6eb9cb3 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -8,35 +8,43 @@
 #define _LARGEFILE_SOURCE
 
 
+#include <sys/types.h>
+#include <sys/time.h>
 #include <unistd.h>
-#include <stddef.h>             /* offsetof() */
-#include <stdlib.h>
 #include <stdarg.h>
+#include <stddef.h>             /* offsetof() */
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <string.h>
 #include <signal.h>
-#include <limits.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/select.h>
+#include <pwd.h>
+#include <grp.h>
+#include <dirent.h>
+
 #include <sys/uio.h>
-#include <sys/ioctl.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <sys/wait.h>
 #include <sys/mman.h>
+#include <sys/resource.h>
+
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <netinet/tcp.h>        /* TCP_CORK */
 #include <arpa/inet.h>
-#include <pwd.h>
-#include <grp.h>
 #include <netdb.h>
-#include <dirent.h>
 
+#include <time.h>               /* tzset() */
+#include <sys/ioctl.h>
+#include <sys/sysctl.h>
+#include <netinet/tcp.h>        /* TCP_CORK */
+
+
+/* Linux has no <sys/filio.h> so autoconfigure does not find FIONBIO */
+#ifndef HAVE_FIONBIO
+#define HAVE_FIONBIO  1
+#endif
 
 #include <ngx_auto_config.h>
 
@@ -80,11 +88,6 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
 #endif
 
 
-#ifndef HAVE_FIONBIO
-#define HAVE_FIONBIO   1
-#endif
-
-
 #ifndef HAVE_SELECT_CHANGE_TIMEOUT
 #define HAVE_SELECT_CHANGE_TIMEOUT   1
 #endif