From: mistachkin <mistachkin@noemail.net>
Date: Fri, 16 May 2014 23:15:50 +0000 (+0000)
Subject: Work around compilation issue with MSVC.
X-Git-Tag: version-3.8.5~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77a90ce811107805c414f381285d5a818e5e34ea;p=thirdparty%2Fsqlite.git

Work around compilation issue with MSVC.

FossilOrigin-Name: 9623a29c11e3a90513016ea3306c085d2bf91b62
---

diff --git a/manifest b/manifest
index 91c09ac09c..361e70cb17 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sprevent\san\sFTS\sindex\sfrom\sgrowing\sindefinitely\sas\sthe\scorresponding\stable\sis\supdated.\sChange\sthe\sFTS\s'automerge'\soption\sto\sallow\sthe\suser\sto\sspecify\sthe\snumber\sof\ssegments\sthat\sshould\sbe\smerged\ssimultaneously\sby\sauto-merges.
-D 2014-05-16T16:16:59.006
+C Work\saround\scompilation\sissue\swith\sMSVC.
+D 2014-05-16T23:15:50.277
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -187,7 +187,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
-F src/main.c bf60d71edc33a48a6e4f7494da64aaf15e6542fd
+F src/main.c 1c164c7b742f0cd60290b34dc9086df9f939f490
 F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@ -1172,7 +1172,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0d43a7ad9abe821e33e0bf83a997aa4461b1e3f2 3997d47bb9c8593a2cd30317ea65163b99db1832
-R 01618b664df3c3b19706db5d70667d8a
-U dan
-Z fa66c3fc7c4b02244be8e29ed55dc1c5
+P a75f1800021d30b712053373440041b7b355a36a
+R e44c4f2d8b2a74316856f263d26bcc16
+U mistachkin
+Z 7ea453b006be693b9823cb9b81301836
diff --git a/manifest.uuid b/manifest.uuid
index d4cefb8a54..92cf7444c6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a75f1800021d30b712053373440041b7b355a36a
\ No newline at end of file
+9623a29c11e3a90513016ea3306c085d2bf91b62
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index b3bc66e849..d150d19d3c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3126,7 +3126,12 @@ int sqlite3_test_control(int op, ...){
     ** sqlite3_test_control().
     */
     case SQLITE_TESTCTRL_FAULT_INSTALL: {
-      sqlite3Config.xTestCallback = va_arg(ap, int(*)(int));
+      /* MSVC is picky about pulling func ptrs from va lists.
+      ** http://support.microsoft.com/kb/47961
+      ** sqlite3Config.xTestCallback = va_arg(ap, int(*)(int));
+      */
+      typedef int(*TESTCALLBACKFUNC_t)(int);
+      sqlite3Config.xTestCallback = va_arg(ap, TESTCALLBACKFUNC_t);
       rc = sqlite3FaultSim(0);
       break;
     }