summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 22:31:18 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 22:31:18 +0000
commit62fd93c79c42fcea77e4527a2f353f92b490f4e5 (patch)
treeb1b4bf8d9c8c8efc43c67637d2f32c0e082a5a9c
parentf979d7c9e6cb4528540aae277ebd3565399de2b7 (diff)
downloadchromium_src-62fd93c79c42fcea77e4527a2f353f92b490f4e5.zip
chromium_src-62fd93c79c42fcea77e4527a2f353f92b490f4e5.tar.gz
chromium_src-62fd93c79c42fcea77e4527a2f353f92b490f4e5.tar.bz2
Attempt to fix Arm build
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69584 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/plugins/ppapi/ppb_nacl_private_impl.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/ppb_nacl_private_impl.cc b/webkit/plugins/ppapi/ppb_nacl_private_impl.cc
index 90e097c..bed8c5a 100644
--- a/webkit/plugins/ppapi/ppb_nacl_private_impl.cc
+++ b/webkit/plugins/ppapi/ppb_nacl_private_impl.cc
@@ -16,8 +16,12 @@ namespace {
bool LaunchSelLdr(const char* alleged_url, int socket_count,
void* imc_handles, void* nacl_process_handle,
int* nacl_process_id) {
+#if !defined(DISABLE_NACL)
return webkit_glue::LaunchSelLdr(alleged_url, socket_count, imc_handles,
nacl_process_handle, nacl_process_id);
+#else
+ return 0;
+#endif
}
int UrandomFD(void) {