diff options
| author | plundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 08:03:31 +0000 |
|---|---|---|
| committer | plundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 08:03:31 +0000 |
| commit | 7d3a3b03c7891b3a6a94178f6bd565be5fca2ffe (patch) | |
| tree | 302b9c5c8e7240891a9ab5ef24a789e2394593e5 /native_client_sdk | |
| parent | b0fe48dbc85a4090bde7b9c1c7650150124654ea (diff) | |
| download | chromium_src-7d3a3b03c7891b3a6a94178f6bd565be5fca2ffe.zip chromium_src-7d3a3b03c7891b3a6a94178f6bd565be5fca2ffe.tar.gz chromium_src-7d3a3b03c7891b3a6a94178f6bd565be5fca2ffe.tar.bz2 | |
[NaCl IO] Fix ODR violation when building under Chromium.
BUG=316353
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/89963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/libraries/nacl_io/kernel_wrap_dummy.cc | 8 |
1 files changed, 6 insertions, 2 deletions
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 44ce8f6..7e52662 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,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if defined(WIN32) || defined(__linux__) +// 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__)) #include <errno.h> @@ -70,7 +72,9 @@ int _real_write(int fd, const void *buf, size_t count, size_t *nwrote) { #endif -#if defined(__linux__) +// The Chromium build system defines __linux__ even for native client builds, +// so guard against __native_client__ being defined as well. +#if defined(__linux__) && !defined(__native_client__) void kernel_wrap_init() { } |