Bug 329807: set USE_IPV6=1 (define _PR_INET6) on HP-UX B.11.23 or later,

based on information from HP.  r=nelsonb,darin
Modified files: configure configure.in _hpux.h
 Tag: NSPR_4_6_BRANCH

3 files changed, 7 insertions, 6 deletions

diff --git a/configure b/configure
index 2b6030af..3c1aaabc 100755
--- a/configure
+++ b/configure
@@ -3581,10 +3581,10 @@ EOF
 
     fi
 
-    # HP-UX 11i (B.11.11) or higher
+    # HP-UX 11i v2 (B.11.23) or higher
     
     case "$OS_RELEASE" in
-    [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[2-9]*|B.11.1[1-9]*)
+    [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[3-9]*|B.11.2[3-9]*)
         USE_IPV6=1
         ;;
     esac
diff --git a/configure.in b/configure.in
index ef0e4006..276ac73c 100644
--- a/configure.in
+++ b/configure.in
@@ -1200,10 +1200,10 @@ tools are selected during the Xcode/Developer Tools installation.])
         AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
     fi
 
-    # HP-UX 11i (B.11.11) or higher
+    # HP-UX 11i v2 (B.11.23) or higher
     changequote(<<,>>)
     case "$OS_RELEASE" in
-    [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[2-9]*|B.11.1[1-9]*)
+    [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[3-9]*|B.11.2[3-9]*)
         USE_IPV6=1
         ;;
     esac
diff --git a/pr/include/md/_hpux.h b/pr/include/md/_hpux.h
index 55156f49..aa311c4e 100644
--- a/pr/include/md/_hpux.h
+++ b/pr/include/md/_hpux.h
@@ -103,11 +103,12 @@ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
 #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
 #endif
 
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
 #define _PR_HAVE_GETIPNODEBYNAME
 #define _PR_HAVE_GETIPNODEBYADDR
 #define _PR_HAVE_GETADDRINFO
+#ifdef _PR_INET6
+#define _PR_HAVE_INET_NTOP
+#else
 #define _PR_INET6_PROBE
 #endif