Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: nspr/pr/src/misc/prnetdb.c

Issue 200653003: Update to NSPR 4.10.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nspr/pr/src/misc/prcountr.c ('k') | nspr/pr/src/misc/prtrace.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nspr/pr/src/misc/prnetdb.c
===================================================================
--- nspr/pr/src/misc/prnetdb.c (revision 257452)
+++ nspr/pr/src/misc/prnetdb.c (working copy)
@@ -2228,10 +2228,6 @@
#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 @@
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
}
« no previous file with comments | « nspr/pr/src/misc/prcountr.c ('k') | nspr/pr/src/misc/prtrace.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698