4 files changed, 13 insertions, 7 deletions
diff --git a/auto/cc/ccc b/auto/cc/ccc
index 968015fe2..298f31e99 100644
--- a/auto/cc/ccc
+++ b/auto/cc/ccc
@@ -10,27 +10,30 @@ ngx_include_opt="-I"
 
 CFLAGS="$CFLAGS -msg_enable level6 -msg_fatal level6"
 
+CFLAGS="$CFLAGS -msg_disable unknownmacro"
+CFLAGS="$CFLAGS -msg_disable unusedincl"
 CFLAGS="$CFLAGS -msg_disable unnecincl"
 CFLAGS="$CFLAGS -msg_disable nestincl"
-CFLAGS="$CFLAGS -msg_disable unusedincl"
-CFLAGS="$CFLAGS -msg_disable unknownmacro"
 CFLAGS="$CFLAGS -msg_disable strctpadding"
 CFLAGS="$CFLAGS -msg_disable ansialiascast"
 CFLAGS="$CFLAGS -msg_disable inlinestoclsmod"
 CFLAGS="$CFLAGS -msg_disable cxxkeyword"
 CFLAGS="$CFLAGS -msg_disable longlongsufx"
+CFLAGS="$CFLAGS -msg_disable valuepres"
 
 # STUB
 CFLAGS="$CFLAGS -msg_disable truncintcast"
 CFLAGS="$CFLAGS -msg_disable trunclongcast"
+
 CFLAGS="$CFLAGS -msg_disable truncintasn"
 CFLAGS="$CFLAGS -msg_disable trunclongint"
 CFLAGS="$CFLAGS -msg_disable intconcastsgn"
 CFLAGS="$CFLAGS -msg_disable intconstsign"
-CFLAGS="$CFLAGS -msg_disable hexoctunsign"
 CFLAGS="$CFLAGS -msg_disable switchlong"
-CFLAGS="$CFLAGS -msg_disable valuepres"
 CFLAGS="$CFLAGS -msg_disable subscrbounds2"
+
+CFLAGS="$CFLAGS -msg_disable hexoctunsign"
+
 CFLAGS="$CFLAGS -msg_disable ignorecallval"
 CFLAGS="$CFLAGS -msg_disable nonstandcast"
 CFLAGS="$CFLAGS -msg_disable embedcomment"
@@ -38,4 +41,5 @@ CFLAGS="$CFLAGS -msg_disable unreachcode"
 CFLAGS="$CFLAGS -msg_disable questcompare2"
 CFLAGS="$CFLAGS -msg_disable unusedtop"
 CFLAGS="$CFLAGS -msg_disable unrefdecl"
+
 CFLAGS="$CFLAGS -msg_disable bitnotint"
diff --git a/auto/cc/conf b/auto/cc/conf
index b2eabebe5..4d151da96 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -124,7 +124,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/feature
 
 
-    if [ $NGX_CC_NAME = 'ccc' ]; then
+    if [ "$NGX_CC_NAME" = "ccc" ]; then
         echo "checking for C99 variadic macros ... disabled"
     else
         ngx_feature="C99 variadic macros"
diff --git a/auto/cc/name b/auto/cc/name
index fb4f49aaf..c89ce7975 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -34,7 +34,7 @@ if `$CC -v 2>&1 | grep 'gcc version' 2>&1 >/dev/null`; then
     echo " using GNU C compiler"
 
 else
-if `$CC -V 2>&1 | grep '^Intel(R) C++ Compiler' 2>&1 >/dev/null`; then
+if `$CC -V 2>&1 | grep '^Intel(R) C' 2>&1 >/dev/null`; then
     NGX_CC_NAME=icc
     echo " using Intel C++ compiler"
 
@@ -49,6 +49,7 @@ if `$CC -V 2>&1 | grep '^aCC: ' 2>&1 >/dev/null`; then
     echo " using HP aC++ compiler"
 
 else
+    NGX_CC_NAME=unknown
     echo " unknown"
 
 fi # acc
diff --git a/auto/os/conf b/auto/os/conf
index 226f8ddc4..69813ce25 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -53,8 +53,9 @@ case "$NGX_PLATFORM" in
     ;;
 
     OSF1:*)
-        # HP Tru64
+        # Tru64 UNIX
         have=NGX_TRU64 . auto/have_headers
+        have=NGX_HAVE_STRERROR_R . auto/nohave
         CORE_INCS="$UNIX_INCS"
         CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
         CORE_SRCS="$UNIX_SRCS"