summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel.h
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 21:18:19 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 21:18:19 +0000
commitfe5d406f982a080ff3b8a503d6b487f16c812d48 (patch)
tree77595f2b8f7e136562deedba553339ea2028568b /ipc/ipc_channel.h
parentde1d2f80e33170f57c942e4950b1a75d4056a127 (diff)
downloadchromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.zip
chromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.tar.gz
chromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.tar.bz2
Add ipc_channel_nacl to the untrusted build and fix all compile/link errors.
ppapi_proxy_untrusted.gyp should now build with a single link error for main. BUG=116317 TEST=builds with a single link error for main(). Review URL: https://chromiumcodereview.appspot.com/10167024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel.h')
-rw-r--r--ipc/ipc_channel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
index 5557306..2aeca1f 100644
--- a/ipc/ipc_channel.h
+++ b/ipc/ipc_channel.h
@@ -160,7 +160,7 @@ class IPC_EXPORT Channel : public Message::Sender {
// deleted once the contents of the Message have been sent.
virtual bool Send(Message* message) OVERRIDE;
-#if defined(OS_POSIX) && !defined(OS_NACL)
+#if defined(OS_POSIX)
// On POSIX an IPC::Channel wraps a socketpair(), this method returns the
// FD # for the client end of the socket.
// This method may only be called on the server side of a channel.