Add some #ifdef-ery to json1.c to avoid a duplicate typedef when used in the

amalgamation, since some compilers become upset over duplicate typedefs.

FossilOrigin-Name: de28acd42f29693341feb884b7223cd3d2b96730

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index fa36419cfc73428fccb18fb399f886d9f08e9c1e..c968011eea0b0597ffef9245425676680664c895 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -71,10 +71,13 @@ static const char jsonIsSpace[] = {
 };
 #define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
 
-/* Unsigned integer types */
-typedef sqlite3_uint64 u64;
-typedef unsigned int u32;
-typedef unsigned char u8;
+#ifndef SQLITE_AMALGAMATION
+  /* Unsigned integer types.  These are already defined in the sqliteInt.h,
+  ** but the definitions need to be repeated for separate compilation. */
+  typedef sqlite3_uint64 u64;
+  typedef unsigned int u32;
+  typedef unsigned char u8;
+#endif
 
 /* Objects */
 typedef struct JsonString JsonString;

diff --git a/manifest b/manifest
index 4d164613abe5ec537076c4633167e8409c49b3dc..44e404e10b1a72d250e0be127c7b13343528afc8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sprevious\sfix\sto\sJSON1\swas\snot\scomplete.\s\sA\sfew\smore\stweaks\sare\sneeded\nfor\scorrect\shandling\sof\sall\soversized\sintegers.
-D 2015-10-09T20:40:44.669
+C Add\ssome\s#ifdef-ery\sto\sjson1.c\sto\savoid\sa\sduplicate\stypedef\swhen\sused\sin\sthe\namalgamation,\ssince\ssome\scompilers\sbecome\supset\sover\sduplicate\stypedefs.
+D 2015-10-10T14:00:37.789
 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 b169036ea45a6d47b56b6b4157c8b0eb60856107
+F ext/misc/json1.c e827cb3148e7db283e4b6ca36a0c16480bf8e743
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@@ -1390,7 +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 ae736e35fb59c9aed33a8c805cf2ecdee528051f
-R d3a3aa15755c918bcb3d0b2253f2a58f
+P 4a47f0177851721cdf6c981df962b6e8862372e7
+R 678f628a8c12a6813211ec0771a1c708
 U drh
-Z d6c45f3b0d0fc25a320efb8ad376e1dd
+Z 1fdffd2212b4b8a28bd72b035f7937f1

diff --git a/manifest.uuid b/manifest.uuid
index d9366b0f4a6e782fee96d797595e694b911a0500..68800f111e83a1cedf83fd44e5d3b4bc467cf1a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a47f0177851721cdf6c981df962b6e8862372e7
\ No newline at end of file
+de28acd42f29693341feb884b7223cd3d2b96730
\ No newline at end of file