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

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

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month 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/Makefile.in b/src/Makefile.in 17 diff --git a/src/Makefile.in b/src/Makefile.in
18 --- a/src/Makefile.in 18 --- a/src/Makefile.in
19 +++ b/src/Makefile.in 19 +++ b/src/Makefile.in
20 @@ -749,7 +749,7 @@ clean-binPROGRAMS: 20 @@ -749,7 +749,7 @@ clean-binPROGRAMS:
21 21
22 curl$(EXEEXT): $(curl_OBJECTS) $(curl_DEPENDENCIES) $(EXTRA_curl_DEPENDENCIES) 22 curl$(EXEEXT): $(curl_OBJECTS) $(curl_DEPENDENCIES) $(EXTRA_curl_DEPENDENCIES)
23 @rm -f curl$(EXEEXT) 23 @rm -f curl$(EXEEXT)
24 - $(AM_V_CCLD)$(curl_LINK) $(curl_OBJECTS) $(curl_LDADD) $(LIBS) 24 - $(AM_V_CCLD)$(curl_LINK) $(curl_OBJECTS) $(curl_LDADD) $(LIBS)
25 + $(AM_V_CCLD)$(curl_LINK) $(curl_OBJECTS) $(curl_LDADD) $(LIBS) $(EXTRA_L IBS) 25 + $(AM_V_CCLD)$(curl_LINK) $(curl_OBJECTS) $(curl_LDADD) $(LIBS) $(EXTRA_L IBS)
26 26
27 mostlyclean-compile: 27 mostlyclean-compile:
28 -rm -f *.$(OBJEXT) 28 -rm -f *.$(OBJEXT)
29 diff --git a/src/tool_main.c b/src/tool_main.c
30 --- a/src/tool_main.c
31 +++ b/src/tool_main.c
32 @@ -213,6 +213,10 @@ static void main_free(struct GlobalConfig *config)
33 config->last = NULL;
34 }
35
36 +#ifdef __native_client__
37 +#define main nacl_main
38 +#endif
39 +
40 /*
41 ** curl tool main function.
42 */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698