| Index: ppapi/c/pp_macros.h
|
| diff --git a/ppapi/c/pp_macros.h b/ppapi/c/pp_macros.h
|
| index 22beebf1298214c87ff5dfe2e9984ba6d5074532..7d4429e8cad853591fce594481edd15b777217c3 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)) \
|
|
|