diff options
author | wtchang%redhat.com <devnull@localhost> | 2007-01-16 22:36:21 +0000 |
---|---|---|
committer | wtchang%redhat.com <devnull@localhost> | 2007-01-16 22:36:21 +0000 |
commit | 8316d896c47cb4c2ffff9d5364cae70ffe520c92 (patch) | |
tree | a56d4699344be9e1b8fcd1c8e82c8fbf4f32f734 | |
parent | d406e99cfb78cebbc9f30290b4dbf3c26536dd1a (diff) | |
download | nspr-hg-8316d896c47cb4c2ffff9d5364cae70ffe520c92.tar.gz |
Bug 329807: backed out the patch. It is incomplete and needs more
testing.
Modified files: configure configure.in _hpux.h
Tag: NSPR_4_6_BRANCH
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | pr/include/md/_hpux.h | 5 |
3 files changed, 6 insertions, 7 deletions
@@ -3581,10 +3581,10 @@ EOF fi - # HP-UX 11i v2 (B.11.23) or higher + # HP-UX 11i (B.11.11) or higher case "$OS_RELEASE" in - [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[3-9]*|B.11.2[3-9]*) + [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[2-9]*|B.11.1[1-9]*) USE_IPV6=1 ;; esac diff --git a/configure.in b/configure.in index 276ac73c..ef0e4006 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 v2 (B.11.23) or higher + # HP-UX 11i (B.11.11) or higher changequote(<<,>>) case "$OS_RELEASE" in - [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[3-9]*|B.11.2[3-9]*) + [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[2-9]*|B.11.1[1-9]*) USE_IPV6=1 ;; esac diff --git a/pr/include/md/_hpux.h b/pr/include/md/_hpux.h index aa311c4e..55156f49 100644 --- a/pr/include/md/_hpux.h +++ b/pr/include/md/_hpux.h @@ -103,12 +103,11 @@ 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 |