Add an "#ifndef SQLITE_AMALGAMATION" block around the typedef for u64 in shathree.c.

FossilOrigin-Name: b411f29e1a6415f4a241777c45591b8389e746cd8b40d9b225e073bcb0a3bdbf
This commit is contained in:
dan 2020-12-11 16:03:19 +00:00
parent d0a0538229
commit 7710878333
3 changed files with 11 additions and 8 deletions

View File

@ -31,7 +31,10 @@ SQLITE_EXTENSION_INIT1
#include <assert.h>
#include <string.h>
#include <stdarg.h>
#ifndef SQLITE_AMALGAMATION
typedef sqlite3_uint64 u64;
#endif /* SQLITE_AMALGAMATION */
/******************************************************************************
** The Hash Engine

View File

@ -1,5 +1,5 @@
C Fix\sthe\sconfigure\sscript\son\sthe\sautoconf\sdistribution\sso\sthat\sthe\n--disable-threadsafe\soption\sworks.\s\sSee\n[https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244459|FreeBSD\sbug\s244459].
D 2020-12-11T14:34:58.941
C Add\san\s"#ifndef\sSQLITE_AMALGAMATION"\sblock\saround\sthe\stypedef\sfor\su64\sin\sshathree.c.
D 2020-12-11T16:03:19.055
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -321,7 +321,7 @@ F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d385
F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946
F ext/misc/series.c c6bd5d249e5199a1b55aeee4d0e6576ff3a68702fc475dbd64503a32903516c7
F ext/misc/sha1.c c8f2253c8792ffab9517695ea7d88c079f0395a5505eefef5c8198fe184ed5ac
F ext/misc/shathree.c 135b7c145db4a09b1650c3e7aff9cb538763a9a361e834c015dd1aaf8d5c9a00
F ext/misc/shathree.c 5398f945a30b4792c757ab16b03cf54ce3b542fe933bbd43e2d6d40c5443b12e
F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
F ext/misc/spellfix.c 94df9bbfa514a563c1484f684a2df3d128a2f7209a84ca3ca100c68a0163e29f
F ext/misc/sqlar.c 0ace5d3c10fe736dc584bf1159a36b8e2e60fab309d310cd8a0eecd9036621b6
@ -1889,7 +1889,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 c2ae7ba6f8f4b10bd734051a0cfa8ed9675bd58c82ede4e9eadfd7cbcc03b82d
R 081acf382e9d875924b95569479a3f66
U drh
Z 18dbb49cec21f6cfe4518d963fb09370
P e64ff2cce3c03ba27c3bf410948ece1424113e727870015eb3806b75d0d21f94
R 718f3d689418739102dd17603d779863
U dan
Z ab9d6df0eec0ce68bf9b160e6deb9056

View File

@ -1 +1 @@
e64ff2cce3c03ba27c3bf410948ece1424113e727870015eb3806b75d0d21f94
b411f29e1a6415f4a241777c45591b8389e746cd8b40d9b225e073bcb0a3bdbf