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

Side by Side Diff: ports/curl/nacl.patch

Issue 1285953002: Switch devenv to use pkg packages (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@toolchain_install
Patch Set: Created 5 years, 4 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 diff --git a/lib/hostip4.c b/lib/hostip4.c 1 diff --git a/lib/hostip4.c b/lib/hostip4.c
2 --- a/lib/hostip4.c 2 --- a/lib/hostip4.c
3 +++ b/lib/hostip4.c 3 +++ b/lib/hostip4.c
4 @@ -115,6 +115,12 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, 4 @@ -115,6 +115,12 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
5 5
6 #if defined(CURLRES_IPV4) && !defined(CURLRES_ARES) 6 #if defined(CURLRES_IPV4) && !defined(CURLRES_ARES)
7 7
8 +#ifdef __native_client__ 8 +#ifdef __native_client__
9 +// nacl_io does not yet support gethostbyname_r(). 9 +// nacl_io does not yet support gethostbyname_r().
10 +// TODO(sbc): remove this once it is added to nacl_io: http://crbug.com/387474 10 +// TODO(sbc): remove this once it is added to nacl_io: http://crbug.com/387474
11 +#undef HAVE_GETHOSTBYNAME_R 11 +#undef HAVE_GETHOSTBYNAME_R
12 +#endif 12 +#endif
13 + 13 +
14 /* 14 /*
15 * Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function. 15 * Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function.
16 * 16 *
17 diff --git a/src/tool_main.c b/src/tool_main.c
18 --- a/src/tool_main.c
19 +++ b/src/tool_main.c
20 @@ -213,6 +213,10 @@ static void main_free(struct GlobalConfig *config)
21 config->last = NULL;
22 }
23
24 +#ifdef PPAPI
25 +#define main nacl_main
26 +#endif
bradn 2015/08/19 20:28:50 Why can this go?
Sam Clegg 2015/08/19 21:31:11 I'm defining this unconditionally on the cmdline n
27 +
28 /*
29 ** curl tool main function.
30 */
OLDNEW
« no previous file with comments | « ports/curl/build.sh ('k') | ports/devenv-latest/pkg_info » ('j') | ports/emacs/build.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698