diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:12:18 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:12:18 +0000 |
commit | 1c6a905fc512c9276e619af5c9fb7ad11369bc3b (patch) | |
tree | ef322078485f2b494809b88a6197f6cd2dcc36c8 /ppapi/proxy | |
parent | 83b02bf3c0e655b8a2a19fa7318720f97c355c00 (diff) | |
download | chromium_src-1c6a905fc512c9276e619af5c9fb7ad11369bc3b.zip chromium_src-1c6a905fc512c9276e619af5c9fb7ad11369bc3b.tar.gz chromium_src-1c6a905fc512c9276e619af5c9fb7ad11369bc3b.tar.bz2 |
PPAPI/NaCl: Speculative implementation for ipc_channel_nacl.cc
BUG=116317
TEST=
Review URL: https://chromiumcodereview.appspot.com/10174048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/proxy_channel.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/proxy_channel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc index c67d83c..f5743e8 100644 --- a/ppapi/proxy/proxy_channel.cc +++ b/ppapi/proxy/proxy_channel.cc @@ -40,7 +40,7 @@ void ProxyChannel::OnChannelError() { channel_.reset(); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_NACL) int ProxyChannel::TakeRendererFD() { DCHECK(channel()); return channel()->TakeClientFileDescriptor(); diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h index 424da94..ffd3f2f 100644 --- a/ppapi/proxy/proxy_channel.h +++ b/ppapi/proxy/proxy_channel.h @@ -78,7 +78,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel return channel_.get(); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_NACL) int TakeRendererFD(); #endif |