diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 02:01:30 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 02:01:30 +0000 |
| commit | fa717fab6f537f25b7656ac3aaa65f706d3c77cc (patch) | |
| tree | c01ff8f0941e070d68e08d969a40a3308f69d1be /ppapi | |
| parent | dab0b124a122db8ca3bde2d769e70609788a3c26 (diff) | |
| download | chromium_src-fa717fab6f537f25b7656ac3aaa65f706d3c77cc.zip chromium_src-fa717fab6f537f25b7656ac3aaa65f706d3c77cc.tar.gz chromium_src-fa717fab6f537f25b7656ac3aaa65f706d3c77cc.tar.bz2 | |
don't use COMPILER_MSVC in pp_macros.h
COMPILER_MSVC is defined in build_config.h which doesn't seem
to be available externally to plugin developers (at least not
with the NaCL SDK). Instead use _MSC_VER which is already used
elsewhere in this file.
R=viettrungluu@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/10824325
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/pp_macros.idl | 2 | ||||
| -rw-r--r-- | ppapi/c/pp_macros.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/api/pp_macros.idl b/ppapi/api/pp_macros.idl index 9d890b8..7954539 100644 --- a/ppapi/api/pp_macros.idl +++ b/ppapi/api/pp_macros.idl @@ -92,7 +92,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES_IMPL(NAME, enum NAME, SIZE) Foo::Foo(MyInstance* instance) : PP_ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {} */ -#if defined(COMPILER_MSVC) +#if defined(_MSC_VER) # define PP_ALLOW_THIS_IN_INITIALIZER_LIST(code) \ __pragma(warning(push)) \ __pragma(warning(disable:4355)) \ diff --git a/ppapi/c/pp_macros.h b/ppapi/c/pp_macros.h index 22beebf..7d4429e 100644 --- a/ppapi/c/pp_macros.h +++ b/ppapi/c/pp_macros.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 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. */ -/* From pp_macros.idl modified Thu Dec 8 23:25:05 2011. */ +/* From pp_macros.idl modified Wed Aug 15 17:29:43 2012. */ #ifndef PPAPI_C_PP_MACROS_H_ #define PPAPI_C_PP_MACROS_H_ @@ -99,7 +99,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES_IMPL(NAME, enum NAME, SIZE) Foo::Foo(MyInstance* instance) : PP_ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {} */ -#if defined(COMPILER_MSVC) +#if defined(_MSC_VER) # define PP_ALLOW_THIS_IN_INITIALIZER_LIST(code) \ __pragma(warning(push)) \ __pragma(warning(disable:4355)) \ |