Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1406)

Unified Diff: native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.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: Reordered functions, routed mprotect to irt version. 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
Index: native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc
index c4d0df8607039cbc471947fc99f975357a8372d9..cb1279f87a8f2156c7becb876c3dbbcef7a03349 100644
--- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc
@@ -2,13 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "nacl_io/kernel_wrap.h" // IRT_EXT is turned on in this header.
+
// The Chromium build system defines __linux__ even for native client builds,
// so guard against __native_client__ being defined as well.
-#if defined(WIN32) || (defined(__linux__) && !defined(__native_client__))
+#if defined(WIN32) || (!defined(NACL_IO_IRT_EXT) && \
binji 2014/10/02 17:54:34 I don't think you want this one. This file will on
David Yen 2014/10/02 18:23:49 I'll revert this file, the !defined(__native_clien
David Yen 2014/10/02 18:26:15 Note that NACL_IO_IRT_EXT is meant to be able to r
+ defined(__linux__) && \
+ !defined(__native_client__))
#include <errno.h>
-#include "nacl_io/kernel_wrap.h"
#include "nacl_io/kernel_wrap_real.h"
// "real" functions, i.e. the unwrapped original functions. For Windows/Linux

Powered by Google App Engine
This is Rietveld 408576698