4 files changed, 29 insertions, 1 deletions
diff --git a/auto/cc/bcc b/auto/cc/bcc
index af108bb21..83b2d60dd 100644
--- a/auto/cc/bcc
+++ b/auto/cc/bcc
@@ -63,5 +63,9 @@ ngx_binout="-e"
 ngx_objext="obj"
 ngx_binext=".exe"
 
+ngx_long_start='@&&|
+	'
+ngx_long_end='|'
+
 ngx_regex_dirsep='\\'
 ngx_dirsep="\\"
diff --git a/auto/cc/conf b/auto/cc/conf
index 37f2d2e42..82854d804 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -11,6 +11,9 @@ ngx_binout="-o "
 ngx_objext="o"
 ngx_binext=
 
+ngx_long_start=
+ngx_long_end=
+
 ngx_regex_dirsep="\/"
 ngx_dirsep='/'
 
@@ -22,6 +25,9 @@ ngx_tab=' \
 		'
 ngx_spacer=
 
+ngx_long_regex_cont=$ngx_regex_cont
+ngx_long_cont=$ngx_cont
+
 . auto/cc/name
 
 if test -n "$CFLAGS"; then
diff --git a/auto/cc/icc b/auto/cc/icc
index d3a151c6e..6af9713b2 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -38,6 +38,7 @@ CFLAGS="$CFLAGS $IPO"
 CORE_LINK="$CORE_LINK $IPO"
 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
 
+
 case $CPU in
     pentium)
         # optimize for Pentium and Athlon
@@ -104,7 +105,7 @@ CFLAGS="$CFLAGS -wd1418"
 CFLAGS="$CFLAGS -wd1419"
 
 case "$NGX_ICC_VER" in
-    8.* | 9.*)
+    9.*)
         # "cc" clobber ignored, warnings for Liunx's htons()
         CFLAGS="$CFLAGS -wd1469"
         # explicit conversion of a 64-bit integral type to a smaller
@@ -119,6 +120,15 @@ case "$NGX_ICC_VER" in
         CFLAGS="$CFLAGS -wd1595"
     ;;
 
+    8.*)
+        # "cc" clobber ignored, warnings for Liunx's htons()
+        CFLAGS="$CFLAGS -wd1469"
+
+        # STUB
+        # non-POD class type passed through ellipsis, Linux only ?
+        CFLAGS="$CFLAGS -wd1595"
+    ;;
+
     *)
     ;;
 esac
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 0fa5df9d7..29c40c79b 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -114,5 +114,13 @@ ngx_binout="-Fe"
 ngx_objext="obj"
 ngx_binext=".exe"
 
+ngx_long_start='@<<
+        '
+ngx_long_end='<<'
+ngx_long_regex_cont=' \
+	'
+ngx_long_cont='
+	'
+
 #ngx_regex_dirsep='\\'
 #ngx_dirsep="\\"