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

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

Issue 635113002: [NaCl SDK] nacl_io: Fix real_node when dealing with a windows terminal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « native_client_sdk/src/libraries/nacl_io/passthroughfs/real_node.cc ('k') | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifdef __native_client__ 5 #ifdef __native_client__
6 #include <irt.h> 6 #include <irt.h>
7 #include <irt_ppapi.h> 7 #include <irt_ppapi.h>
8 #endif 8 #endif
9 9
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 24 matching lines...) Expand all
35 struct nacl_irt_ppapihook hooks; 35 struct nacl_irt_ppapihook hooks;
36 if (nacl_interface_query(NACL_IRT_PPAPIHOOK_v0_1, &hooks, sizeof(hooks)) == 36 if (nacl_interface_query(NACL_IRT_PPAPIHOOK_v0_1, &hooks, sizeof(hooks)) ==
37 sizeof(hooks)) { 37 sizeof(hooks)) {
38 return PpapiPluginMain(); 38 return PpapiPluginMain();
39 } 39 }
40 #else 40 #else
41 int main(int argc, char* argv[]) { 41 int main(int argc, char* argv[]) {
42 #endif 42 #endif
43 // By default, or if not running in the browser we simply run the main 43 // By default, or if not running in the browser we simply run the main
44 // entry point directly, on the main thread. 44 // entry point directly, on the main thread.
45 nacl_io_init(); 45 int rtn = nacl_io_init();
46 int rtn = PSUserMainGet()(argc, argv); 46 if (rtn != 0)
47 return rtn;
48 rtn = PSUserMainGet()(argc, argv);
47 nacl_io_uninit(); 49 nacl_io_uninit();
48 return rtn; 50 return rtn;
49 } 51 }
OLDNEW
« no previous file with comments | « native_client_sdk/src/libraries/nacl_io/passthroughfs/real_node.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698