| Index: ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
|
| index 487a47085e197b077ce3159e8f951c45ad431e33..5d2c233c7b5c71f03ec1873129f49162bf861269 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
|
| @@ -7,10 +7,14 @@
|
| #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
|
| #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
|
|
|
| +#if defined(__native_client__)
|
| #include "native_client/src/include/portability.h"
|
| +#endif
|
| #include "native_client/src/untrusted/irt/irt_ppapi.h"
|
|
|
| -EXTERN_C_BEGIN
|
| +#ifdef __cplusplus
|
| +extern "C" {
|
| +#endif
|
|
|
| // Initialize srpc connection to the browser. Some APIs like manifest file
|
| // opening do not need full ppapi initialization and so can be used after
|
| @@ -23,6 +27,22 @@ int PpapiPluginMain(void);
|
| void PpapiPluginRegisterThreadCreator(
|
| const struct PP_ThreadFunctions* new_funcs);
|
|
|
| -EXTERN_C_END
|
| +#ifdef __cplusplus
|
| +}
|
| +#endif
|
| +
|
| +#if !defined(__native_client__)
|
| +// The following functions are available only for non-SFI mode.
|
| +namespace base {
|
| +class WaitableEvent;
|
| +} // namespace base
|
| +
|
| +namespace ppapi {
|
| +namespace proxy {
|
| +void SetPpapiStartEvent(base::WaitableEvent* ppapi_start_event);
|
| +void SetIPCFileDescriptors(int browser_ipc_fd, int renderer_ipc_fd);
|
| +} // namespace proxy
|
| +} // namespace ppapi
|
| +#endif
|
|
|
| #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
|
|
|