include/utils/SkJSONCPP.h - Issue 282053002: Generate bench/Android.mk from gyp.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/utils/SkJSONCPP.h

Issue 282053002: Generate bench/Android.mk from gyp. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselines

Patch Set: Remove modifications to generated files to submit. Created 6 years, 7 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:

Index: include/utils/SkJSONCPP.h

diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h

index 8dbb40c91bedfa3c52a56415a9e041a030a58a28..966d064e9f09d9e4ca6e96457c30d9ace844d0d9 100644

--- a/include/utils/SkJSONCPP.h

+++ b/include/utils/SkJSONCPP.h

@@ -10,6 +10,8 @@

#ifndef SkJSONCPP_DEFINED

#define SkJSONCPP_DEFINED

+#ifdef SK_BUILD_JSON_WRITER

#ifdef SK_BUILD_FOR_WIN

// json includes xlocale which generates warning 4530 because we're

// compiling without exceptions;

@@ -23,4 +25,6 @@

#pragma warning(pop)

#endif

-#endif

+#endif // SK_BUILD_JSON_WRITER

+#endif // SkJSONCPP_DEFINED

« no previous file with comments | « gyp/jsoncpp.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »