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

Unified Diff: src/untrusted/irt/irt_entry.c

Issue 7605029: Extend IRT with nacl_irt_resource_open interface (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: more lint warnings Created 9 years, 4 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
Index: src/untrusted/irt/irt_entry.c
===================================================================
--- src/untrusted/irt/irt_entry.c (revision 6384)
+++ src/untrusted/irt/irt_entry.c (working copy)
@@ -9,6 +9,7 @@
#include "native_client/src/include/elf32.h"
#include "native_client/src/include/elf_auxv.h"
+#include "native_client/src/shared/ppapi_proxy/ppruntime.h"
#include "native_client/src/untrusted/irt/irt_interfaces.h"
#include "native_client/src/untrusted/nacl/nacl_irt.h"
#include "native_client/src/untrusted/nacl/nacl_startup.h"
@@ -68,6 +69,15 @@
entry->a_type = AT_SYSINFO;
entry->a_un.a_val = (uintptr_t) nacl_irt_interface;
+#ifdef IRT_PPAPI
+ if (PpapiPluginPreInit()) {
Roland McGrath 2011/08/12 16:44:56 Don't do this here. It could be in a constructor
halyavin 2011/08/15 10:35:52 I implemented this as a constructor.
+ static const char fatal_msg[] =
+ "ppapi initialization (PpapiPluginPreInit) failed.\n";
+ write(2, fatal_msg, sizeof(fatal_msg) - 1);
+ _exit(-1);
+ }
+#endif
+
/*
* Call the user entry point function. It should not return.
*/

Powered by Google App Engine
This is Rietveld 408576698