Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: include/utils/SkJSONCPP.h

Issue 853613002: upstream google3 include paths for jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698