diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 18:01:34 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 18:01:34 +0000 |
| commit | b4fa72938a67658d3cd2f94d65a6f37e3858c612 (patch) | |
| tree | d643e7326528072c597da3f99811c5f540681b31 | |
| parent | a8505bfa7d8ed444267db1f738b5fe1ea7de786c (diff) | |
| download | chromium_src-b4fa72938a67658d3cd2f94d65a6f37e3858c612.zip chromium_src-b4fa72938a67658d3cd2f94d65a6f37e3858c612.tar.gz chromium_src-b4fa72938a67658d3cd2f94d65a6f37e3858c612.tar.bz2 | |
NaCl IPC bringup.
The IPC channel defines GetClientFileDescriptor only on POSIX. We haven't
worked out yet exactly what NaCl primitive we're goign to use for an IPC
channel, but we probably won't use a file descriptor. Removing this API
in NaCl helps make this file compile. If we later find out we need this API,
we might need to revisit this decision.
Original patch by Eric Seidel.
Review URL: http://codereview.chromium.org/4821004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65962 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ipc/ipc_channel.h | 2 | ||||
| -rw-r--r-- | ipc/ipc_channel_proxy.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 65ed9f0..2445e51 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -83,7 +83,7 @@ class Channel : public Message::Sender { // deleted once the contents of the Message have been sent. virtual bool Send(Message* message); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_NACL) // 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. diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 5b9083b..f05ae485 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -334,7 +334,7 @@ void ChannelProxy::ClearIPCMessageLoop() { context()->ClearIPCMessageLoop(); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_NACL) // See the TODO regarding lazy initialization of the channel in // ChannelProxy::Init(). // We assume that IPC::Channel::GetClientFileDescriptorMapping() is thread-safe. |