diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 02:19:01 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 02:19:01 +0000 |
| commit | c8e1ea3eb9d111f9c1ef2b2b394e497a6b820abe (patch) | |
| tree | 69040559dd1d16965e5c09c4315e193bc0f9658c /ppapi | |
| parent | e4b1429ff7f4ec1d9b100482df6970689aa25a31 (diff) | |
| download | chromium_src-c8e1ea3eb9d111f9c1ef2b2b394e497a6b820abe.zip chromium_src-c8e1ea3eb9d111f9c1ef2b2b394e497a6b820abe.tar.gz chromium_src-c8e1ea3eb9d111f9c1ef2b2b394e497a6b820abe.tar.bz2 | |
NaCl: Remove use of the C++ IMC interface; use the C version instead
We want to remove the C++ version of IMC from the NaCl side.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3303
TEST=build
Review URL: https://codereview.chromium.org/12225154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/private/ppb_nacl_private.idl | 2 | ||||
| -rw-r--r-- | ppapi/c/private/ppb_nacl_private.h | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/nacl_entry_points.h | 4 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/service_runtime.cc | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl index e5d14a0..4f14d5a 100644 --- a/ppapi/api/private/ppb_nacl_private.idl +++ b/ppapi/api/private/ppb_nacl_private.idl @@ -36,7 +36,7 @@ enum PP_NaClError { /* PPB_NaCl_Private */ interface PPB_NaCl_Private { /* Launches NaCl's sel_ldr process. Returns PP_NACL_OK on success and - * writes a nacl::Handle to imc_handle. Returns PP_NACL_FAILED on failure. + * writes a NaClHandle to imc_handle. Returns PP_NACL_FAILED on failure. * The |enable_ppapi_dev| parameter controls whether GetInterface * returns 'Dev' interfaces to the NaCl plugin. The |uses_ppapi| flag * indicates that the nexe run by sel_ldr will use the PPAPI APIs. diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index 2bd0591..b73de17 100644 --- a/ppapi/c/private/ppb_nacl_private.h +++ b/ppapi/c/private/ppb_nacl_private.h @@ -61,7 +61,7 @@ typedef enum { /* PPB_NaCl_Private */ struct PPB_NaCl_Private_1_0 { /* Launches NaCl's sel_ldr process. Returns PP_NACL_OK on success and - * writes a nacl::Handle to imc_handle. Returns PP_NACL_FAILED on failure. + * writes a NaClHandle to imc_handle. Returns PP_NACL_FAILED on failure. * The |enable_ppapi_dev| parameter controls whether GetInterface * returns 'Dev' interfaces to the NaCl plugin. The |uses_ppapi| flag * indicates that the nexe run by sel_ldr will use the PPAPI APIs. diff --git a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h index d40e254..f915edd 100644 --- a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h +++ b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h @@ -12,7 +12,7 @@ #include <map> #include <string> -#include "native_client/src/shared/imc/nacl_imc.h" +#include "native_client/src/shared/imc/nacl_imc_c.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/private/ppb_nacl_private.h" @@ -21,7 +21,7 @@ typedef PP_NaClResult (*LaunchNaClProcessFunc)(PP_Instance instance, PP_Bool uses_irt, PP_Bool uses_ppapi, PP_Bool enable_ppapi_dev, - nacl::Handle* result_socket); + NaClHandle* result_socket); extern LaunchNaClProcessFunc launch_nacl_process; diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc index 5653b62..ea7c262 100644 --- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc +++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc @@ -21,7 +21,6 @@ #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/nacl_scoped_ptr.h" #include "native_client/src/include/nacl_string.h" -#include "native_client/src/shared/imc/nacl_imc.h" #include "native_client/src/shared/platform/nacl_check.h" #include "native_client/src/shared/platform/nacl_log.h" #include "native_client/src/shared/platform/nacl_sync.h" |