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

Unified Diff: ports/m4/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/lua/build.sh ('k') | ports/make/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/m4/nacl.patch
diff --git a/ports/m4/nacl.patch b/ports/m4/nacl.patch
index a637b0578b0bdb512f00b8b62bb588dc8e5a99c8..bf59d43b466d2e5a690f6161f8787175d22f8a11 100644
--- a/ports/m4/nacl.patch
+++ b/ports/m4/nacl.patch
@@ -182,18 +182,6 @@ diff --git a/src/builtin.c b/src/builtin.c
diff --git a/src/m4.c b/src/m4.c
--- a/src/m4.c
+++ b/src/m4.c
-@@ -362,7 +362,11 @@ process_file (const char *name)
- #endif
-
- int
-+#if defined(__native_client__)
-+nacl_main (int argc, const char *argv[])
-+#else
- main (int argc, char *const *argv)
-+#endif
- {
- struct sigaction act;
- macro_definition *head; /* head of deferred argument list */
@@ -403,7 +407,11 @@ main (int argc, char *const *argv)
sigemptyset (&act.sa_mask);
/* One-shot - if we fault while handling a fault, we want to revert
« no previous file with comments | « ports/lua/build.sh ('k') | ports/make/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698