diff options
| -rw-r--r-- | ext/misc/totype.c | 9 | ||||
| -rw-r--r-- | manifest | 15 | ||||
| -rw-r--r-- | manifest.uuid | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/ext/misc/totype.c b/ext/misc/totype.c index bb4acb267..5dc99f3d7 100644 --- a/ext/misc/totype.c +++ b/ext/misc/totype.c @@ -56,8 +56,13 @@ SQLITE_EXTENSION_INIT1 ** These macros are designed to work correctly on both 32-bit and 64-bit ** compilers. */ -#define LARGEST_INT64 (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32)) -#define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64) +#ifndef LARGEST_INT64 +# define LARGEST_INT64 (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32)) +#endif + +#ifndef SMALLEST_INT64 +# define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64) +#endif /* ** Return TRUE if character c is a whitespace character @@ -1,5 +1,5 @@ -C Fix\sharmless\scompiler\swarning\sin\sthe\stotype\sextension.\s\sInclude\sall\sstandard\swhitespace\scharacters\sin\stotypeIsspace.\s\sMinor\sadjustments\sto\sstyle\sand\scomments. -D 2013-10-14T22:35:40.075 +C Fix\sharmless\smacro\sredefinition\swarnings\sin\sthe\stotype\sextension. +D 2013-10-15T10:43:04.884 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -115,7 +115,7 @@ F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a F ext/misc/spellfix.c 5e1d547e9a2aed13897fa91bac924333f62fd2d9 -F ext/misc/totype.c 86eeb8efb5c0e1a09d713e4183ff1eda95c8f342 +F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 F ext/misc/vfslog.c 1abb192d8d4bd323adbddec0c024580496b51b7a F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 @@ -1125,7 +1125,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 9f66dd7e3790c04f0ab724419f5381bd21f9ebad -R f21c7b96aefc2201770b50ac2899ad7e +P 73238f655a58c810876f46cc04eab1ac2d5b8ef7 +R 0fe1cba58471de6f4ef89edb477677c8 +T *branch * noWarnings +T *sym-noWarnings * +T -sym-trunk * U mistachkin -Z 42e92dc11d48272f024e4ddd08e08231 +Z 63a2ac2e5d8e33918534e02f647beddb diff --git a/manifest.uuid b/manifest.uuid index d796a6ec1..43452c755 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -73238f655a58c810876f46cc04eab1ac2d5b8ef7
\ No newline at end of file +a38adeb7ffd77474754b66877d60717cdb3cb865
\ No newline at end of file |