native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc - Issue 608913003: Added support for NaCl IO to use the IRT Extension API.

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: native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc

Issue 608913003: Added support for NaCl IO to use the IRT Extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed assert checks to a macro Created 6 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« native_client_sdk/src/libraries/nacl_io/kernel_wrap.h ('K') | « native_client_sdk/src/libraries/nacl_io/kernel_wrap.h ('k') | native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc » ('j') | native_client_sdk/src/libraries/nacl_io/kernel_wrap_irt_ext.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc

diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc

index 621e0bd5e922efbe9aaa09698d6c6f16c3c00d32..a3087b7c24e147469ecb143ba782f4aecf686757 100644

--- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc

+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_bionic.cc

@@ -4,10 +4,14 @@

#include <sys/types.h> // Include something that will define __BIONIC__.

+#include "nacl_io/kernel_wrap.h" // IRT_EXT is turned on in this header.

// The entire file is wrapped in this #if. We do this so this .cc file can be

// compiled, even on a non-bionic build.

-#if defined(__native_client__) && defined(__BIONIC__)

+#if !defined(__NACL_IO_IRT_EXT__) && defined(__native_client__) && \

+ defined(__BIONIC__)

#include <alloca.h>

#include <assert.h>

#include <dirent.h>

@@ -18,7 +22,6 @@

#include <sys/time.h>

#include "nacl_io/kernel_intercept.h"

-#include "nacl_io/kernel_wrap.h"

#include "nacl_io/kernel_wrap_real.h"

#include "nacl_io/osmman.h"