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

1 files changed, 20 insertions, 18 deletions

diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h
index 431841cff..b1e71cd4e 100644
--- a/src/os/unix/ngx_solaris_config.h
+++ b/src/os/unix/ngx_solaris_config.h
@@ -6,33 +6,40 @@
 
 #define _REENTRANT
 
-#define _FILE_OFFSET_BITS  64   /* must be before sys/types.h */
+#define _FILE_OFFSET_BITS  64   /* must be before <sys/types.h> */
 
+#include <sys/types.h>
+#include <sys/time.h>
 #include <unistd.h>
-#include <inttypes.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 <sys/types.h>
+#include <pwd.h>
+#include <grp.h>
+#include <dirent.h>
+
+#include <sys/uio.h>
+#include <sys/filio.h>          /* FIONBIO */
 #include <sys/stat.h>
+#include <fcntl.h>
+
 #include <sys/wait.h>
 #include <sys/mman.h>
+#include <sys/resource.h>
+
 #include <sys/socket.h>
-#include <sys/sendfile.h>
-#include <sys/filio.h>          /* FIONBIO */
-#include <sys/systeminfo.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <pwd.h>
-#include <grp.h>
 #include <netdb.h>
-#include <dirent.h>
+
+#include <sys/sendfile.h>
+#include <sys/systeminfo.h>
+#include <limits.h>             /* IOV_MAX */
+#include <inttypes.h>
 
 #include <ngx_auto_config.h>
 
@@ -66,11 +73,6 @@
 #endif
 
 
-#ifndef HAVE_FIONBIO
-#define HAVE_FIONBIO   1
-#endif
-
-
 #define ngx_setproctitle(title)