diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-17 10:18:53 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-17 10:18:53 +0000 |
| commit | 7fd9f2a37792d9105e26a5e233cf8f911efd51f9 (patch) | |
| tree | ead731f6ae10131e780e8ac76504fe5cb62c271c /sandbox/src/sandbox.cc | |
| parent | 382abc2bc90652b921c092e3342e8920f0603b17 (diff) | |
| download | chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.zip chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.tar.gz chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.tar.bz2 | |
Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The broker currently launches with --no-sandbox, so the 64-bit version of the sandbox library is there only to allow successful build.
BUG=27218
TEST=none
Review URL: http://codereview.chromium.org/543058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/sandbox.cc')
| -rw-r--r-- | sandbox/src/sandbox.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sandbox/src/sandbox.cc b/sandbox/src/sandbox.cc index f0b42bf..d8dceee 100644 --- a/sandbox/src/sandbox.cc +++ b/sandbox/src/sandbox.cc @@ -9,7 +9,8 @@ #include "sandbox/src/broker_services.h" #include "sandbox/src/target_services.h" -#ifdef _WIN64 +#if defined(_WIN64) && !defined(NACL_WIN64) +// We allow building this code for Win64 as part of NaCl to enable development #error Sandbox code was not tested on 64-bit Windows. See \ http://code.google.com/p/chromium/issues/detail?id=27218 for details \ and progress log. |