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

1 files changed, 7 insertions, 4 deletions

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index fa36419cf..c968011ee 100644
--- 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;