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

Unified Diff: ports/make/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/make/build.sh ('k') | ports/mongoose/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/make/nacl.patch
diff --git a/ports/make/nacl.patch b/ports/make/nacl.patch
index dd4bcfb9745cf7c36fb5b1843ede0fc4f2c91577..93d23005bb58a557737a73acfb06f92ec3166166 100644
--- a/ports/make/nacl.patch
+++ b/ports/make/nacl.patch
@@ -15,22 +15,12 @@ diff --git a/job.c b/job.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -911,6 +911,9 @@ open_tmpfile(char **name, const char *template)
- #ifdef _AMIGA
- int
- main (int argc, char **argv)
-+#elif defined(__native_client__)
-+int
-+nacl_main (int argc, char **argv)
- #else
- int
- main (int argc, char **argv, char **envp)
@@ -921,6 +924,9 @@ main (int argc, char **argv, char **envp)
struct dep *read_makefiles;
PATH_VAR (current_directory);
unsigned int restarts = 0;
+#if defined(__native_client__)
-+ char **envp = environ;
++ envp = environ;
+#endif
#ifdef WINDOWS32
char *unix_path = NULL;
« no previous file with comments | « ports/make/build.sh ('k') | ports/mongoose/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698