Index: include/utils/SkJSONCPP.h |
diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h |
index de827687e0f6b5eab253dfecb6d12a49b27ee24d..6baf223610d6be5f8d8696c5f1115769025bb8fe 100644 |
--- a/include/utils/SkJSONCPP.h |
+++ b/include/utils/SkJSONCPP.h |
@@ -10,18 +10,24 @@ |
#ifndef SkJSONCPP_DEFINED |
#define SkJSONCPP_DEFINED |
-#ifdef SK_BUILD_FOR_WIN |
- // json includes xlocale which generates warning 4530 because we're |
- // compiling without exceptions; |
- // see https://code.google.com/p/skia/issues/detail?id=1067 |
- #pragma warning(push) |
- #pragma warning(disable : 4530) |
-#endif |
-#include "json/reader.h" |
-#include "json/value.h" |
-#include "json/writer.h" |
-#ifdef SK_BUILD_FOR_WIN |
- #pragma warning(pop) |
+#ifdef GOOGLE3 |
+ #include "third_party/jsoncpp/reader.h" |
+ #include "third_party/jsoncpp/value.h" |
+ #include "third_party/jsoncpp/writer.h" |
+#else |
+ #ifdef SK_BUILD_FOR_WIN |
+ // json includes xlocale which generates warning 4530 because we're |
+ // compiling without exceptions; |
+ // see https://code.google.com/p/skia/issues/detail?id=1067 |
+ #pragma warning(push) |
+ #pragma warning(disable : 4530) |
+ #endif |
+ #include "json/reader.h" |
+ #include "json/value.h" |
+ #include "json/writer.h" |
+ #ifdef SK_BUILD_FOR_WIN |
+ #pragma warning(pop) |
+ #endif |
#endif |
#endif // SkJSONCPP_DEFINED |