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

Side by Side 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, 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
« no previous file with comments | « ports/less/build.sh ('k') | ports/libgit2-demo/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/Makefile.in b/Makefile.in
2 --- a/Makefile.in
3 +++ b/Makefile.in
4 @@ -54,7 +54,7 @@ OBJ = \
5 all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
6
7 less$(EXEEXT): ${OBJ}
8 - ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
9 + ${CC} ${LDFLAGS} -o $@ ${OBJ} ${NACL_CLI_MAIN_LIB} ${LIBS}
10
11 lesskey$(EXEEXT): lesskey.${O} version.${O}
12 ${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
13 diff --git a/main.c b/main.c
14 --- a/main.c
15 +++ b/main.c
16 @@ -64,7 +64,12 @@ extern int pr_type;
17 * Entry point.
18 */
19 int
20 -main(argc, argv)
21 +# if defined(__native_client__)
22 +nacl_main
23 +# else
24 +main
25 +# endif
26 +(argc, argv)
27 int argc;
28 char *argv[];
29 {
30 diff --git a/screen.c b/screen.c 1 diff --git a/screen.c b/screen.c
31 --- a/screen.c 2 --- a/screen.c
32 +++ b/screen.c 3 +++ b/screen.c
33 @@ -282,7 +282,8 @@ raw_mode(on) 4 @@ -282,7 +282,8 @@ raw_mode(on)
34 save_term = s; 5 save_term = s;
35 saved_term = 1; 6 saved_term = 1;
36 } 7 }
37 -#if HAVE_OSPEED 8 -#if HAVE_OSPEED
38 +/*cfgetospeed is not linkable , shouldn't define HAVE_OSPEED */ 9 +/*cfgetospeed is not linkable , shouldn't define HAVE_OSPEED */
39 +#if HAVE_OSPEED && !defined(__native_client__) 10 +#if HAVE_OSPEED && !defined(__native_client__)
40 switch (cfgetospeed(&s)) 11 switch (cfgetospeed(&s))
41 { 12 {
42 #ifdef B0 13 #ifdef B0
OLDNEW
« 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