From 4e8f0a76a825acd08f373b0492c90bdd6cc10f0b Mon Sep 17 00:00:00 2001 From: "dmichael@chromium.org" Date: Thu, 31 May 2012 19:37:54 +0000 Subject: PPAPI/NaCl: Re-land speculative implementation for ipc_channel_nacl.cc Original CL: http://codereview.chromium.org/10174048/ Was committed at 139635, reverted at 139646 due to a flake. BUG=116317 TEST= TBR=dmichael@chromium.org Review URL: https://chromiumcodereview.appspot.com/10442112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139840 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/proxy_channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ppapi/proxy/proxy_channel.h') 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 -- cgit v1.1