diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 19:36:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 19:36:05 +0000 |
| commit | 19de27cee58c3922c4df30871fd047568d10fc20 (patch) | |
| tree | 424f2940139bff132ffed491a5e95ddd74ec7c00 /sandbox | |
| parent | 6d81bd18e4ab65747b72e1ebcacb19a21aadd053 (diff) | |
| download | chromium_src-19de27cee58c3922c4df30871fd047568d10fc20.zip chromium_src-19de27cee58c3922c4df30871fd047568d10fc20.tar.gz chromium_src-19de27cee58c3922c4df30871fd047568d10fc20.tar.bz2 | |
win: Fix some preprocessor confusion clang complains about.
No intended functionality change.
BUG=82385
TEST=compiles
Review URL: http://codereview.chromium.org/10341002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/src/crosscall_client.h | 4 | ||||
| -rw-r--r-- | sandbox/src/policy_broker.cc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sandbox/src/crosscall_client.h b/sandbox/src/crosscall_client.h index e58388c9..b61186f 100644 --- a/sandbox/src/crosscall_client.h +++ b/sandbox/src/crosscall_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -297,7 +297,7 @@ class CopyHelper<InOutCountedBuffer> { void* raw_mem = ipc_provider.GetBuffer(); \ if (NULL == raw_mem) \ return SBOX_ERROR_NO_SPACE; \ - ActualParams* ##params = new(raw_mem) ActualParams(tag); + ActualParams* params = new(raw_mem) ActualParams(tag); #define XCALL_GEN_COPY_PARAM(num, params) \ COMPILE_ASSERT(kMaxIpcParams >= num, too_many_parameters); \ diff --git a/sandbox/src/policy_broker.cc b/sandbox/src/policy_broker.cc index 9882f38..61c64c6 100644 --- a/sandbox/src/policy_broker.cc +++ b/sandbox/src/policy_broker.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,15 +28,15 @@ namespace sandbox { SANDBOX_INTERCEPT NtExports g_nt; #define INIT_GLOBAL_NT(member) \ - g_nt.##member = reinterpret_cast<Nt##member##Function>( \ + g_nt.member = reinterpret_cast<Nt##member##Function>( \ ntdll_image.GetProcAddress("Nt" #member)); \ - if (NULL == g_nt.##member) \ + if (NULL == g_nt.member) \ return false #define INIT_GLOBAL_RTL(member) \ - g_nt.##member = reinterpret_cast<##member##Function>( \ + g_nt.member = reinterpret_cast<member##Function>( \ ntdll_image.GetProcAddress(#member)); \ - if (NULL == g_nt.##member) \ + if (NULL == g_nt.member) \ return false bool SetupNtdllImports(TargetProcess *child) { |