From ee9fbb6d691b3684ea1290b3d5616df0419cccd1 Mon Sep 17 00:00:00 2001 From: "mseaborn@chromium.org" Date: Fri, 21 Feb 2014 00:37:59 +0000 Subject: NaCl: Address some TODOs from moving PPAPI IRT interface into the Chromium repo BUG=https://code.google.com/p/nativeclient/issues/detail?id=3787 TEST=build R=teravest@chromium.org Review URL: https://codereview.chromium.org/171683019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252437 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/nacl_irt/irt_ppapi.h | 8 -------- ppapi/proxy/irt_ppapi.c | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'ppapi') diff --git a/ppapi/nacl_irt/irt_ppapi.h b/ppapi/nacl_irt/irt_ppapi.h index d1cbbee..344e10c 100644 --- a/ppapi/nacl_irt/irt_ppapi.h +++ b/ppapi/nacl_irt/irt_ppapi.h @@ -33,12 +33,6 @@ struct PP_ThreadFunctions { int (*thread_join)(uintptr_t tid); }; -/* - * TODO(mseaborn): Make this unconditional after the definition of the - * struct has been removed from the NaCl side's irt.h. - */ -#if !defined(NACL_IRT_PPAPIHOOK_v0_1) - #define NACL_IRT_PPAPIHOOK_v0_1 "nacl-irt-ppapihook-0.1" struct nacl_irt_ppapihook { int (*ppapi_start)(const struct PP_StartFunctions*); @@ -46,5 +40,3 @@ struct nacl_irt_ppapihook { }; #endif - -#endif diff --git a/ppapi/proxy/irt_ppapi.c b/ppapi/proxy/irt_ppapi.c index 64c22aa..be6a216 100644 --- a/ppapi/proxy/irt_ppapi.c +++ b/ppapi/proxy/irt_ppapi.c @@ -33,11 +33,7 @@ const void* PPP_GetInterface(const char* interface_name) { return g_pp_functions.PPP_GetInterface(interface_name); } -/* - * TODO(mseaborn): This can be made static when the NaCl side no - * longer refers to it. - */ -const struct nacl_irt_ppapihook nacl_irt_ppapihook = { +static const struct nacl_irt_ppapihook nacl_irt_ppapihook = { irt_ppapi_start, PpapiPluginRegisterThreadCreator, }; -- cgit v1.1