From: drh Date: Sat, 31 Dec 2016 14:33:05 +0000 (+0000) Subject: Minor #include change to speedtest1.c so that it will compile under MSVC. X-Git-Tag: version-3.17.0~149^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb25713e9151f0b7dfdb5eee45230cfe86d27f32;p=thirdparty%2Fsqlite.git Minor #include change to speedtest1.c so that it will compile under MSVC. FossilOrigin-Name: 8c28fde004678c85524770969eb001719b109179 --- diff --git a/manifest b/manifest index 0b232f2882..99ed22e9a4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\scrash\sthat\scould\soccur\sfollowing\san\sOOM\sin\sthe\sgroup_concat()\sfunction\nif\sthe\ssecond\sargument\sis\san\sSQLITE_BLOB\svalue. -D 2016-12-30T17:40:14.373 +C Minor\s#include\schange\sto\sspeedtest1.c\sso\sthat\sit\swill\scompile\sunder\sMSVC. +D 2016-12-31T14:33:05.615 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -1127,7 +1127,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c 0c92fd0db4cb778e3b6968db0ea859e28f077823 +F test/speedtest1.c 2feca857787efbcb8aefcc7b6fdc83455bcaa582 F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -1541,7 +1541,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a0971e713682a73d8c7c20511db256c20d2f6388 -R b2119513a85656f5ab1ba46bed3bca22 -U dan -Z b8d94ab9819b45ed8f5f9b27f33e84f7 +P 14d855d2b2b5b3485e0673d11405db7266b34c6d +R 4e28a4a24a558a17288e2b686fdb973b +T *branch * speedtest1 +T *sym-speedtest1 * +T -sym-trunk * +U drh +Z cb0ac3a36d5b0ce57e9784586a6bed06 diff --git a/manifest.uuid b/manifest.uuid index c1f02179dd..3005918343 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -14d855d2b2b5b3485e0673d11405db7266b34c6d \ No newline at end of file +8c28fde004678c85524770969eb001719b109179 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index d568aada0a..09aef40fdf 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -50,7 +50,11 @@ static const char zHelp[] = #include #include #include -#include +#ifndef _WIN32 +# include +#else +# include +#endif #define ISSPACE(X) isspace((unsigned char)(X)) #define ISDIGIT(X) isdigit((unsigned char)(X))