OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 * | 6 * |
7 * A common place to put the jsoncpp library includes, as opposed to littering | 7 * A common place to put the jsoncpp library includes, as opposed to littering |
8 * the pragmas repeatedly through our code. | 8 * the pragmas repeatedly through our code. |
9 */ | 9 */ |
10 #ifndef SkJSONCPP_DEFINED | 10 #ifndef SkJSONCPP_DEFINED |
11 #define SkJSONCPP_DEFINED | 11 #define SkJSONCPP_DEFINED |
12 | 12 |
13 #ifdef SK_BUILD_FOR_WIN | 13 #ifdef GOOGLE3 |
14 // json includes xlocale which generates warning 4530 because we're | 14 #include "third_party/jsoncpp/reader.h" |
15 // compiling without exceptions; | 15 #include "third_party/jsoncpp/value.h" |
16 // see https://code.google.com/p/skia/issues/detail?id=1067 | 16 #include "third_party/jsoncpp/writer.h" |
17 #pragma warning(push) | 17 #else |
18 #pragma warning(disable : 4530) | 18 #ifdef SK_BUILD_FOR_WIN |
19 #endif | 19 // json includes xlocale which generates warning 4530 because we're |
20 #include "json/reader.h" | 20 // compiling without exceptions; |
21 #include "json/value.h" | 21 // see https://code.google.com/p/skia/issues/detail?id=1067 |
22 #include "json/writer.h" | 22 #pragma warning(push) |
23 #ifdef SK_BUILD_FOR_WIN | 23 #pragma warning(disable : 4530) |
24 #pragma warning(pop) | 24 #endif |
| 25 #include "json/reader.h" |
| 26 #include "json/value.h" |
| 27 #include "json/writer.h" |
| 28 #ifdef SK_BUILD_FOR_WIN |
| 29 #pragma warning(pop) |
| 30 #endif |
25 #endif | 31 #endif |
26 | 32 |
27 #endif // SkJSONCPP_DEFINED | 33 #endif // SkJSONCPP_DEFINED |
OLD | NEW |