nginx-0.0.2-2004-03-04-19:34:23 import

4 files changed, 16 insertions, 5 deletions

diff --git a/auto/cc b/auto/cc
index 6d901162e..bb2a3bf94 100644
--- a/auto/cc
+++ b/auto/cc
@@ -119,4 +119,9 @@ case $CC in
          CC_STRONG="$CC -W3 -WX"
     ;;
 
+
+    wcc386)
+         # Open Watcom 1.0
+    ;;
+
 esac
diff --git a/auto/make b/auto/make
index c75a099dc..31c414c26 100644
--- a/auto/make
+++ b/auto/make
@@ -43,7 +43,10 @@ do
 done
 echo                                          >> $MAKEFILE
 
-inc=`echo "$CORE_INCS -I $OBJS" | sed -e "s/\//\\\\\\/g"`
+inc="$CORE_INCS -I $OBJS"
+if [ $PLATFORM = win32 ]; then
+    inc=`echo $inc | sed -e "s/\//\\\\\\/g"`
+fi
 echo "CORE_INCS = $inc"                       >> $MAKEFILE
 echo                                          >> $MAKEFILE
 
@@ -57,7 +60,10 @@ do
 done
 echo                                          >> $MAKEFILE
 
-inc=`echo "$HTTP_INCS" | sed -e "s/\//\\\\\\/g"`
+inc="$HTTP_INCS"
+if [ $PLATFORM = win32 ]; then
+    inc=`echo $inc | sed -e "s/\//\\\\\\/g"`
+fi
 echo "HTTP_INCS = $inc"                       >> $MAKEFILE
 echo                                          >> $MAKEFILE
 
diff --git a/auto/types/typedef b/auto/types/typedef
index c8a905f95..531bb7e2f 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -10,9 +10,9 @@ do
 
     cat << END > $NGX_AUTOTEST.c
 
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <netinet/in.h>
diff --git a/auto/unix b/auto/unix
index 017f7bf6a..55b66bf93 100755
--- a/auto/unix
+++ b/auto/unix
@@ -25,8 +25,8 @@ NGX_AUTO_CONFIG="#include \"../$NGX_AUTO_CONFIG_H\""
 ngx_type="uint64_t"
 ngx_types="u_int64_t"; . auto/types/typedef
 
-#ngx_type="sig_atomic_t"
-#ngx_types="int"; . auto/types/typedef
+ngx_type="sig_atomic_t"
+ngx_types="int"; . auto/types/typedef
 
 ngx_type="socklen_t"
 ngx_types="uint32_t"; . auto/types/typedef