Chromium Code Reviews| 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. |
| */ |