ipc/ipc_channel_proxy.cc - Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ipc/ipc_channel_proxy.cc

Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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:

Index: ipc/ipc_channel_proxy.cc

diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc

index 07f955289cee8c28c0c9aaecf1025f65ed15f0a2..64fab8fca56db0067e909aa5f96d2fe04443e912 100644

--- a/ipc/ipc_channel_proxy.cc

+++ b/ipc/ipc_channel_proxy.cc

@@ -434,8 +434,7 @@ void ChannelProxy::ClearIPCTaskRunner() {

context()->ClearIPCTaskRunner();

}

-#if defined(OS_POSIX) && \

- (!defined(OS_NACL) || defined(__native_client_nonsfi__))

+#if defined(OS_POSIX) && !defined(OS_NACL_SFI)

// See the TODO regarding lazy initialization of the channel in

// ChannelProxy::Init().

int ChannelProxy::GetClientFileDescriptor() {

« no previous file with comments | « ipc/ipc_channel_proxy.h ('k') | no next file » | no next file with comments »