diff options
Diffstat (limited to 'gm/gmmain.cpp')
| -rw-r--r-- | gm/gmmain.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index e313352c4d..19adf2658d 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -33,7 +33,16 @@ #include "SkTileGridPicture.h" #include "SamplePipeControllers.h" +#ifdef SK_BUILD_FOR_WIN + // json includes xlocale which generates warning 4530 because we're compiling without + // exceptions + #pragma warning(push) + #pragma warning(disable : 4530) +#endif #include "json/value.h" +#ifdef SK_BUILD_FOR_WIN + #pragma warning(pop) +#endif #if SK_SUPPORT_GPU #include "GrContextFactory.h" |