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

Side by Side Diff: native_client_sdk/src/libraries/ppapi_simple/ps_main.c

Issue 964983002: [NaCl SDK] ppapi_simple: Don't initialize nacl_io when running in sel_ldr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright 2015 The Chromium Authors. All rights reserved. 1 /* Copyright 2015 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 #include "ppapi_simple/ps_main.h" 5 #include "ppapi_simple/ps_main.h"
6 6
7 #ifdef __native_client__ 7 #ifdef __native_client__
8 #include <irt.h> 8 #include <irt.h>
9 #include <irt_ppapi.h> 9 #include <irt_ppapi.h>
10 #endif 10 #endif
(...skipping 19 matching lines...) Expand all
30 struct nacl_irt_ppapihook hooks; 30 struct nacl_irt_ppapihook hooks;
31 if (nacl_interface_query(NACL_IRT_PPAPIHOOK_v0_1, &hooks, sizeof(hooks)) == 31 if (nacl_interface_query(NACL_IRT_PPAPIHOOK_v0_1, &hooks, sizeof(hooks)) ==
32 sizeof(hooks)) { 32 sizeof(hooks)) {
33 return PpapiPluginMain(); 33 return PpapiPluginMain();
34 } 34 }
35 #else 35 #else
36 int main(int argc, char* argv[]) { 36 int main(int argc, char* argv[]) {
37 #endif 37 #endif
38 // By default, or if not running in the browser we simply run the main 38 // By default, or if not running in the browser we simply run the main
39 // entry point directly, on the main thread. 39 // entry point directly, on the main thread.
40 int rtn = nacl_io_init(); 40 return PSUserMainGet()(argc, argv);
41 if (rtn != 0)
42 return rtn;
43 rtn = PSUserMainGet()(argc, argv);
44 nacl_io_uninit();
45 return rtn;
46 } 41 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698