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

6 files changed, 23 insertions, 9 deletions

diff --git a/auto/func b/auto/func
index fcbbe0183..3f12b7890 100644
--- a/auto/func
+++ b/auto/func
@@ -5,10 +5,11 @@ echo "checking for $ngx_func" >> $NGX_ERR
 
 ngx_found=no
 
-func=`echo $ngx_func | sed -e 's/()$//' | tr '[a-z]' '[A-Z]'`
+func=`echo $ngx_func | sed -e 's/()$//' | tr '[a-z.]' '[A-Z_]'`
 
 cat << END > $NGX_AUTOTEST.c
 
+#include <sys/types.h>
 $NGX_UNISTD_H
 $ngx_func_inc
 
diff --git a/auto/os/conf b/auto/os/conf
index 94fdbcd56..623ba3129 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -45,4 +45,10 @@ case $PLATFORM in
         CORE_LIBS="$CORE_LIBS ws2_32.lib"
     ;;
 
+    *)
+        CORE_INCS="$UNIX_INCS"
+        CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
+        CORE_SRCS="$UNIX_SRCS"
+    ;;
+
 esac
diff --git a/auto/os/freebsd b/auto/os/freebsd
index 53d732207..5fa8e33e3 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -66,6 +66,3 @@ if [ $EVENT_AIO = YES ]; then
 else
     have=HAVE_AIO . auto/nohave
 fi
-
-
-have=HAVE_MSGHDR_MSG_CONTROL . auto/have
diff --git a/auto/os/linux b/auto/os/linux
index 6a9b8b559..c34fba1ac 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -77,6 +77,3 @@ ngx_func_test="prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)"
 if [ $ngx_found = yes ]; then
     have=HAVE_PR_SET_DUMPABLE . auto/have
 fi
-
-
-have=HAVE_MSGHDR_MSG_CONTROL . auto/have
diff --git a/auto/sources b/auto/sources
index c48443392..a49cca0b3 100644
--- a/auto/sources
+++ b/auto/sources
@@ -125,6 +125,8 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_posix_init.c \
             src/os/unix/ngx_process_cycle.c"
 
+POSIX_DEPS=src/os/unix/ngx_posix_config.h
+
 FREEBSD_DEPS=src/os/unix/ngx_freebsd_config.h
 FREEBSD_SRCS=src/os/unix/ngx_freebsd_init.c
 FREEBSD_SENDFILE_SRCS=src/os/unix/ngx_freebsd_sendfile_chain.c
diff --git a/auto/unix b/auto/unix
index c150f2e9c..183a5039e 100755
--- a/auto/unix
+++ b/auto/unix
@@ -41,8 +41,7 @@ ngx_types="int"; . auto/types/typedef
 
 
 ngx_func="sin_len"
-ngx_func_inc="#include <sys/types.h>
-#include <sys/socket.h>
+ngx_func_inc="#include <sys/socket.h>
 #include <netinet/in.h>"
 
 ngx_func_test="struct sockaddr_in sa; sa.sin_len = 5"
@@ -122,3 +121,15 @@ ngx_func="memalign()"
 ngx_func_inc="#include <stdlib.h>"
 ngx_func_test="void *p; p = memalign(4096, 4096)"
 . auto/func
+
+
+ngx_func="msghdr.msg_control"
+ngx_func_inc="#include <sys/socket.h>"
+ngx_func_test="struct msghdr  msg; msg.msg_control = NULL"
+. auto/func
+
+
+ngx_func="FIONBIO"
+ngx_func_inc="#include <sys/filio.h>"
+ngx_func_test="int i; i = FIONBIO"
+. auto/func