Make sure i64 and u64 typedefs are available throughout shell.c.

FossilOrigin-Name: 656fb5aab32f40412389e43de209867cedee1589533949cc8c01ba24218ea434

diff --git a/manifest b/manifest
index 9634780370f0275ad1ffb84b5fd90db1ce82c922..d848453f6ab6b6df13cf4d88193993a07f7428be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sshell.c.in\samalgamator\sscript\sso\sthat\sit\savoids\sgenerating\nredundant\stypedef\sstatements.
-D 2018-01-05T20:30:54.903
+C Make\ssure\si64\sand\su64\stypedefs\sare\savailable\sthroughout\sshell.c.
+D 2018-01-05T21:01:37.129
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in c4a9842dcd07572a106da739fa4f76d5ae228e3c4c40c859c84ceaa71c36348e
@@ -483,7 +483,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
-F src/shell.c.in df0e5728a6b41c676f0bb55716ca317081eba5e741ba45e513c842c4533bda58
+F src/shell.c.in 4cfa9394737306c5a5f3d7f72e74868df5f3010676d6a1a2a52db37b61b0c13a
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1694,7 +1694,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 73023febbe57495a22db05904bd6ddff439d6c25970cbe87e0ba4a923f3e8a29
-R 9251688fbd83640e3673feb22bd548ce
+P 6c53c740cb4f62305689ea0a73beca83e71ed86707094e850bed975965c8c9f2
+R 7d026919c293c5c42c6d20698632fda7
 U drh
-Z 4f1367bc1221f28464fd760bb035ab98
+Z 6c996af85ed6472bcfa0c4295fc91bf0

diff --git a/manifest.uuid b/manifest.uuid
index 3810fe573023f522c02b1071c65d9b5c4606a0dd..b50e96dbc64206b4b5cc4fb643b1d0130c8168bf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c53c740cb4f62305689ea0a73beca83e71ed86707094e850bed975965c8c9f2
\ No newline at end of file
+656fb5aab32f40412389e43de209867cedee1589533949cc8c01ba24218ea434
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 832450fea7a44a563f88938fc0d2daccdd6cdef9..bb4428fbc540f477ddd797728c125052e0f6351a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -61,6 +61,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include "sqlite3.h"
+typedef sqlite3_int64 i64;
+typedef sqlite3_uint64 u64;
 #if SQLITE_USER_AUTHENTICATION
 # include "sqlite3userauth.h"
 #endif