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

Unified Diff: ports/less/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/less/build.sh ('k') | ports/libgit2-demo/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/less/nacl.patch
diff --git a/ports/less/nacl.patch b/ports/less/nacl.patch
index 4324bdf06144b23fc1a813e6fb2d554866573b69..4f9bc1f50539df0f836d789c828001ea89b122c9 100644
--- a/ports/less/nacl.patch
+++ b/ports/less/nacl.patch
@@ -1,32 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -54,7 +54,7 @@ OBJ = \
- all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
-
- less$(EXEEXT): ${OBJ}
-- ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
-+ ${CC} ${LDFLAGS} -o $@ ${OBJ} ${NACL_CLI_MAIN_LIB} ${LIBS}
-
- lesskey$(EXEEXT): lesskey.${O} version.${O}
- ${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
-diff --git a/main.c b/main.c
---- a/main.c
-+++ b/main.c
-@@ -64,7 +64,12 @@ extern int pr_type;
- * Entry point.
- */
- int
--main(argc, argv)
-+# if defined(__native_client__)
-+nacl_main
-+# else
-+main
-+# endif
-+(argc, argv)
- int argc;
- char *argv[];
- {
diff --git a/screen.c b/screen.c
--- a/screen.c
+++ b/screen.c
« no previous file with comments | « ports/less/build.sh ('k') | ports/libgit2-demo/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698