native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c - Issue 412083002: [NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c

Issue 412083002: [NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 | « native_client_sdk/src/examples/tutorial/testing/testing.cc ('k') | native_client_sdk/src/libraries/ppapi_simple/ps.h » ('j') | native_client_sdk/src/libraries/ppapi_simple/ps.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c

diff --git a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c

index 10322d01b0fb2e6aaec3d7fd5c3789b707c8eb56..31e88fa515990375250a7b06a78c2169b29a8af7 100644

--- a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c

+++ b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c

@@ -8,10 +8,6 @@

#include "ppapi_simple/ps_main.h"

-#ifdef SEL_LDR

-#define example_main main

-#endif

int example_main(int argc, char* argv[]) {

/* Use ppb_messaging to send "Hello World" to JavaScript. */

printf("Hello World STDOUT.\n");

@@ -28,6 +24,4 @@ int example_main(int argc, char* argv[]) {

* This is not needed when building the sel_ldr version of this example

* which does not link against ppapi_simple.

-#ifndef SEL_LDR

PPAPI_SIMPLE_REGISTER_MAIN(example_main)

-#endif