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

Unified Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 3023025: NaCl: Fix link time error when DISABLE_NACL is set (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 years, 5 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/nacl_host/nacl_process_host.cc
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 8ae96371ea33ca01f7df86dc7e7ebf99c95c35b2..5c9d9dafac3eff16f108a13a6e9e52f370f16488 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -55,12 +55,17 @@ NaClProcessHost::~NaClProcessHost() {
if (!reply_msg_)
return;
+ // nacl::Close() is not available at link time if DISABLE_NACL is
+ // defined, but we still compile a bunch of other code from this
+ // file anyway. TODO(mseaborn): Make this less messy.
+#ifndef DISABLE_NACL
for (size_t i = 0; i < sockets_for_renderer_.size(); i++) {
nacl::Close(sockets_for_renderer_[i]);
}
for (size_t i = 0; i < sockets_for_sel_ldr_.size(); i++) {
nacl::Close(sockets_for_sel_ldr_[i]);
}
+#endif
// OnProcessLaunched didn't get called because the process couldn't launch.
// Don't keep the renderer hanging.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698