From: dan <dan@noemail.net>
Date: Wed, 14 Oct 2015 18:45:42 +0000 (+0000)
Subject: Avoid exporting sqlite3_json_init() from amalgamation builds.
X-Git-Tag: version-3.10.0~239^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d32e8042cc7c3f68099eea533a6481873e79dc3;p=thirdparty%2Fsqlite.git

Avoid exporting sqlite3_json_init() from amalgamation builds.

FossilOrigin-Name: 8463f7e7908d0a96ed036377dfa3805328c62925
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index d5f019ff98..337e4d3b0d 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -2022,6 +2022,7 @@ int sqlite3Json1Init(sqlite3 *db){
 }
 
 
+#ifndef SQLITE_CORE
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -2034,4 +2035,5 @@ int sqlite3_json_init(
   (void)pzErrMsg;  /* Unused parameter */
   return sqlite3Json1Init(db);
 }
+#endif
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1) */
diff --git a/manifest b/manifest
index d6c6d0e394..db5a8b9441 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.9.0
-D 2015-10-14T12:29:53.720
+C Avoid\sexporting\ssqlite3_json_init()\sfrom\samalgamation\sbuilds.
+D 2015-10-14T18:45:42.476
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -198,7 +198,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
 F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
-F ext/misc/json1.c d31022098b0c4c7c2c1781cb328180a4da6fbdb3
+F ext/misc/json1.c fed5b948168f26f39e67d898b03d93dd00e75196
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@@ -1390,10 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 47a2ce97d585e1760ffcf760c0de1753677d5713
-R 41ced18917e64acb8afddf6eb6ae0b31
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.9.0 *
-U drh
-Z b8800b50bce461e41ccef8a16de7b330
+P a721fc0d89495518fe5612e2e3bbc60befd2e90d
+R 91fe8986fc4249f600867bbdb41be531
+U dan
+Z 2ae4d2560a7d6d806cb90ab807854a5b
diff --git a/manifest.uuid b/manifest.uuid
index ea62748708..2a577e009f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a721fc0d89495518fe5612e2e3bbc60befd2e90d
\ No newline at end of file
+8463f7e7908d0a96ed036377dfa3805328c62925
\ No newline at end of file