From: mistachkin <mistachkin@noemail.net>
Date: Wed, 11 Oct 2017 17:50:22 +0000 (+0000)
Subject: Make JSON1 defines consistent in the makefiles for MSVC.
X-Git-Tag: version-3.21.0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=690e8858fe65b7ed007a95f2a55512a5ad17285e;p=thirdparty%2Fsqlite.git

Make JSON1 defines consistent in the makefiles for MSVC.

FossilOrigin-Name: 31eee0e4bffc5419e076a589049bfea7327dfc666fcc2767c0b700f506055c4e
---

diff --git a/Makefile.msc b/Makefile.msc
index de4f8b196f..0fed23dce6 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1514,7 +1514,7 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE
 # <<mark>>
 # Extra compiler options for various test tools.
 #
-MPTESTER_COMPILE_OPTS = -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS5
+MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
 FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
 FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index f0f9a01ee0..f535d1450a 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -927,7 +927,7 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 
diff --git a/manifest b/manifest
index 6e831045b9..804cc5e872 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Enable\sJSON\sby\sdefault\sin\sthe\sWindows\scommand-line\sshell\ssqlite3.exe.
-D 2017-10-11T17:25:08.609
+C Make\sJSON1\sdefines\sconsistent\sin\sthe\smakefiles\sfor\sMSVC.
+D 2017-10-11T17:50:22.538
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc aade743c45bf10cc6d0150d97842e310ac3d91d4f3640a286139d4e72451b96f
+F Makefile.msc 307701b46e4ac0e2aaa7776ea5936fff21636e991c9d5988584f37d65be9c13e
 F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-F autoconf/Makefile.msc b77aec100e4fb4739748a2461b5aa82c179fcde35bc0e08ce52ae7322d218701
+F autoconf/Makefile.msc 55328895d224f1b81298224929a16b8601baa75f9d7badd493224f68a22700dd
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac 2893b823ecc86cea13739f6c8109a41392254d1db08235c5615e0af5722c8578
@@ -1656,7 +1656,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0f160a8abb0409b6e687ebc13b732559b3d65428f72430df142fd925eb39e9a2
-R 7fea6f857c00d4f29f020f0f9a952e04
-U drh
-Z b088c8a18ee6c3891400703c6e00fc6b
+P 79c96121baf065fd78ba4f1fe82ce725b6372df20e9323d88022b7c243701372
+R 2d35bd3f9bb9d088160d8caa2fcda76b
+U mistachkin
+Z ae3424fdef9b7840b735184e2f02e403
diff --git a/manifest.uuid b/manifest.uuid
index ce3f7ad848..f9b265f962 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79c96121baf065fd78ba4f1fe82ce725b6372df20e9323d88022b7c243701372
\ No newline at end of file
+31eee0e4bffc5419e076a589049bfea7327dfc666fcc2767c0b700f506055c4e
\ No newline at end of file