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

Side by Side Diff: nspr/pr/src/misc/prnetdb.c

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* This Source Code Form is subject to the terms of the Mozilla Public 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 #include "primpl.h" 6 #include "primpl.h"
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 /* 10 /*
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 */ 56 */
57 #if defined(XP_BEOS) && defined(BONE_VERSION) 57 #if defined(XP_BEOS) && defined(BONE_VERSION)
58 #include <arpa/inet.h> /* pick up define for inet_addr */ 58 #include <arpa/inet.h> /* pick up define for inet_addr */
59 #include <sys/socket.h> 59 #include <sys/socket.h>
60 #define _PR_HAVE_GETPROTO_R 60 #define _PR_HAVE_GETPROTO_R
61 #define _PR_HAVE_GETPROTO_R_POINTER 61 #define _PR_HAVE_GETPROTO_R_POINTER
62 #endif 62 #endif
63 63
64 #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ 64 #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
65 || (defined(LINUX) && defined(_REENTRANT) \ 65 || (defined(LINUX) && defined(_REENTRANT) \
66 && !(defined(__GLIBC__) && __GLIBC__ >= 2) \ 66 && defined(__GLIBC__) && __GLIBC__ < 2)
67 && !defined(ANDROID))
68 #define _PR_HAVE_GETPROTO_R 67 #define _PR_HAVE_GETPROTO_R
69 #define _PR_HAVE_GETPROTO_R_POINTER 68 #define _PR_HAVE_GETPROTO_R_POINTER
70 #endif 69 #endif
71 70
72 #if defined(OSF1) \ 71 #if defined(OSF1) \
73 || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ 72 || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
74 || (defined(HPUX10_10) && defined(_REENTRANT)) \ 73 || (defined(HPUX10_10) && defined(_REENTRANT)) \
75 || (defined(HPUX10_20) && defined(_REENTRANT)) \ 74 || (defined(HPUX10_20) && defined(_REENTRANT)) \
76 || defined(OPENBSD) 75 || defined(OPENBSD)
77 #define _PR_HAVE_GETPROTO_R 76 #define _PR_HAVE_GETPROTO_R
(...skipping 2256 matching lines...) Expand 10 before | Expand all | Expand 10 after
2334 #if !defined(_PR_HAVE_GETADDRINFO) 2333 #if !defined(_PR_HAVE_GETADDRINFO)
2335 return pr_NetAddrToStringFB(addr, string, size); 2334 return pr_NetAddrToStringFB(addr, string, size);
2336 #else 2335 #else
2337 #if defined(_PR_INET6_PROBE) 2336 #if defined(_PR_INET6_PROBE)
2338 if (!_pr_ipv6_is_present()) 2337 if (!_pr_ipv6_is_present())
2339 return pr_NetAddrToStringFB(addr, string, size); 2338 return pr_NetAddrToStringFB(addr, string, size);
2340 #endif 2339 #endif
2341 return pr_NetAddrToStringGNI(addr, string, size); 2340 return pr_NetAddrToStringGNI(addr, string, size);
2342 #endif 2341 #endif
2343 } /* PR_NetAddrToString */ 2342 } /* PR_NetAddrToString */
OLDNEW
« no previous file with comments | « nspr/pr/src/misc/prenv.c ('k') | nspr/pr/src/misc/prtpool.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698