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

Unified Diff: ports/netcat/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, 2 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 | « ports/nano/build.sh ('k') | ports/nethack/nethack_pepper.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/netcat/nacl.patch
diff --git a/ports/netcat/nacl.patch b/ports/netcat/nacl.patch
index a0ea3a0cb758d214fb8ecf68d8ef7542f32e9b34..8a41da8088b45d50b06332d46180b70cd5605610 100644
--- a/ports/netcat/nacl.patch
+++ b/ports/netcat/nacl.patch
@@ -59,30 +59,6 @@ diff --git a/src/flagset.c b/src/flagset.c
ret = netcat_flag_next(ret);
/* don't return this same flag again */
-diff --git a/src/netcat.c b/src/netcat.c
---- a/src/netcat.c
-+++ b/src/netcat.c
-@@ -135,7 +135,11 @@ static void ncexec(nc_sock_t *ncsock)
-
- /* main: handle command line arguments and listening status */
-
-+#if defined(__native_client__)
-+int nacl_ppapi_main(int argc, char *argv[])
-+#else
- int main(int argc, char *argv[])
-+#endif
- {
- int c, glob_ret = EXIT_FAILURE;
- int total_ports, left_ports, accept_ret = -1, connect_ret = -1;
-@@ -616,3 +620,8 @@ int main(int argc, char *argv[])
- netcat_printstats(FALSE);
- return glob_ret;
- } /* end of main() */
-+
-+#if defined(__native_client__)
-+#include "ppapi_simple/ps_main.h"
-+PPAPI_SIMPLE_REGISTER_MAIN(nacl_ppapi_main)
-+#endif
diff --git a/src/udphelper.c b/src/udphelper.c
--- a/src/udphelper.c
+++ b/src/udphelper.c
« no previous file with comments | « ports/nano/build.sh ('k') | ports/nethack/nethack_pepper.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698