database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Merge recent changes from trunk.

Browse Source 
FossilOrigin-Name: 6eefdad946da6a5f4052ac51d327777890fa3f18
This commit is contained in:
drh
2014-05-19 23:17:33 +00:00
parent 5f4a479048 27f2468422
commit db2f91907d
13 changed files with 942 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.c
View File

@@ -3136,7 +3136,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;
}