diff options
| author | dan <dan@noemail.net> | 2019-07-23 13:26:43 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2019-07-23 13:26:43 +0000 |
| commit | 1c70f71e12bfaf07d851d1263ff872eb46bc8501 (patch) | |
| tree | 1b739f0f841a13e203237d183c79dc1b06f4a6b8 /ext/misc/fossildelta.c | |
| parent | 9378818d898c09aa1eb075a337c1d3b12388baac (diff) | |
| download | sqlite-1c70f71e12bfaf07d851d1263ff872eb46bc8501.tar.gz sqlite-1c70f71e12bfaf07d851d1263ff872eb46bc8501.zip | |
Avoid redefining types u32 and u16 when fossildelta.c is compiled as part of the amalgamation.
FossilOrigin-Name: d8e88248e3204b5f2b95b9b8921ee7ee2f7574ae81e6abd5b4f2ddf187f7d71b
Diffstat (limited to 'ext/misc/fossildelta.c')
| -rw-r--r-- | ext/misc/fossildelta.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/misc/fossildelta.c b/ext/misc/fossildelta.c index 2c7154882..d5f62a8d2 100644 --- a/ext/misc/fossildelta.c +++ b/ext/misc/fossildelta.c @@ -36,6 +36,7 @@ #include "sqlite3ext.h" SQLITE_EXTENSION_INIT1 +#ifndef SQLITE_AMALGAMATION /* ** The "u32" type must be an unsigned 32-bit integer. Adjust this */ @@ -47,6 +48,8 @@ typedef unsigned int u32; typedef short int s16; typedef unsigned short int u16; +#endif /* SQLITE_AMALGAMATION */ + /* ** The width of a hash window in bytes. The algorithm only works if this |