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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c

Issue 1512233002: PPAPI/NaCl: Move plugin_main.cc's contents into irt_ppapi.cc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years 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 | « ppapi/nacl_irt/plugin_startup.h ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c
index b52b8e9b3981cb8a79b6c6786d5d5c767b007964..f3296e630ade183932af9be842b40e26a98abe7f 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c
@@ -7,9 +7,9 @@
#include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h"
#include "native_client/src/untrusted/irt/irt.h"
+#include "ppapi/nacl_irt/irt_ppapi.h"
#include "ppapi/nacl_irt/public/irt_ppapi.h"
#include "ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h"
-#include "ppapi/nacl_irt/plugin_main.h"
/*
* Defines a version of the version irt_ppapi_start and of the irt_ppapihook
@@ -48,7 +48,6 @@ int (*real_irt_ppapi_start)(const struct PP_StartFunctions *) = NULL;
* Otherwise, when linking directly into the IRT, we can refer to the
* real irt_ppapi_start from irt_ppapi.
*/
-extern int irt_ppapi_start(const struct PP_StartFunctions *);
static int (* const real_irt_ppapi_start)(const struct PP_StartFunctions *) =
&irt_ppapi_start;
#endif
« no previous file with comments | « ppapi/nacl_irt/plugin_startup.h ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698