diff options
Diffstat (limited to 'chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c')
| -rw-r--r-- | chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c b/chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c index 7d05e574be0..b86248f863f 100644 --- a/chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c +++ b/chromium/third_party/nss/nspr/pr/src/misc/prnetdb.c @@ -2228,10 +2228,6 @@ PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) #if !defined(_PR_HAVE_GETADDRINFO) return pr_StringToNetAddrFB(string, addr); #else -#if defined(_PR_INET6_PROBE) - if (!_pr_ipv6_is_present()) - return pr_StringToNetAddrFB(string, addr); -#endif /* * getaddrinfo with AI_NUMERICHOST is much slower than pr_inet_aton on some * platforms, such as Mac OS X (bug 404399), Linux glibc 2.10 (bug 344809), @@ -2241,6 +2237,11 @@ PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) if (!strchr(string, '%')) return pr_StringToNetAddrFB(string, addr); +#if defined(_PR_INET6_PROBE) + if (!_pr_ipv6_is_present()) + return pr_StringToNetAddrFB(string, addr); +#endif + return pr_StringToNetAddrGAI(string, addr); #endif } |