From: drh <drh@noemail.net>
Date: Thu, 18 Jun 2015 15:26:09 +0000 (+0000)
Subject: Further #ifdef changes in speedtest1.c in order to support SQLite back to
X-Git-Tag: version-3.8.11~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4307690b5cdbe17e152e21a8f2ddf2c66eaf9c93;p=thirdparty%2Fsqlite.git

Further #ifdef changes in speedtest1.c in order to support SQLite back to
version 3.3.9 and perhaps even earlier.

FossilOrigin-Name: 9246eca54adaee571dab0c066afaa604fcf9c44f
---

diff --git a/manifest b/manifest
index 4565c70b63..806cfda95a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Pervent\sthe\slikelihood()\sfunction\sfrom\smoving\sON\sclause\sterms\sof\sa\sLEFT\sJOIN\ninto\sthe\sWHERE\sclause.\nFix\sfor\sticket\s[5f60b11fc8e23490e2]
-D 2015-06-18T14:32:51.732
+C Further\s#ifdef\schanges\sin\sspeedtest1.c\sin\sorder\sto\ssupport\sSQLite\sback\sto\nversion\s3.3.9\sand\sperhaps\seven\searlier.
+D 2015-06-18T15:26:09.205
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -928,7 +928,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c 613e7f6064123068049ffd9b74a60b3c8d51e8ab
+F test/speedtest1.c f42fd04a34a0c1dc289cbe536ef62d706227a736
 F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
 F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
 F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68
@@ -1286,7 +1286,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a84d1004cbee67f2b8ba1fd201e43af49ea67c1b
-R 530ba24618abbbf122ded3eb71849514
+P ed96e14adce4a4f94cc6838c46bc97937c4cb72a
+R 4e77e4d1b1f5f9af9315f930f1585b67
 U drh
-Z 790eb5c98101c017e4fe81f6e31f872f
+Z 4a2d5290228b5807450e51ccee479c2e
diff --git a/manifest.uuid b/manifest.uuid
index 4391ae8b19..e752e4c060 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed96e14adce4a4f94cc6838c46bc97937c4cb72a
\ No newline at end of file
+9246eca54adaee571dab0c066afaa604fcf9c44f
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 9a90f5b6ff..db343d81ff 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -43,6 +43,9 @@ static const char zHelp[] =
 #include <string.h>
 #include <ctype.h>
 
+#if SQLITE_VERSION_NUMBER<3005000
+# define sqlite3_int64 sqlite_int64
+#endif
 #ifdef SQLITE_ENABLE_OTA
 # include "sqlite3ota.h"
 #endif
@@ -143,6 +146,9 @@ static int integerValue(const char *zArg){
 
 /* Return the current wall-clock time, in milliseconds */
 sqlite3_int64 speedtest1_timestamp(void){
+#if SQLITE_VERSION_NUMBER<3005000
+  return 0;
+#else
   static sqlite3_vfs *clockVfs = 0;
   sqlite3_int64 t;
   if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
@@ -157,6 +163,7 @@ sqlite3_int64 speedtest1_timestamp(void){
     t = (sqlite3_int64)(r*86400000.0);
   }
   return t;
+#endif
 }
 
 /* Return a pseudo-random unsigned integer */