From 52b1dbb5fc949a629d7213661c968c722b9e5029 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 28 Jul 2016 14:37:04 +0000 Subject: Allow the 'testfixture.exe' target to be compiled with the __stdcall calling convention. FossilOrigin-Name: e8be3dfeabaa31b3490793cf8230faae1204be15 --- src/test_superlock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/test_superlock.c') diff --git a/src/test_superlock.c b/src/test_superlock.c index cac789842..cad5b51f0 100644 --- a/src/test_superlock.c +++ b/src/test_superlock.c @@ -256,7 +256,11 @@ int sqlite3demo_superlock( #ifdef SQLITE_TEST -#include +#if defined(INCLUDE_SQLITE_TCL_H) +# include "sqlite_tcl.h" +#else +# include "tcl.h" +#endif struct InterpAndScript { Tcl_Interp *interp; -- cgit v1.2.3 From 7617e4a8a4564689a839cf116dae0012b4753a65 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 28 Jul 2016 17:11:20 +0000 Subject: Make sure the SQLITE_TCLAPI macro is always defined. FossilOrigin-Name: f2f1323cc4d2ad2d6794dbfae8d50b747213e85d --- src/test_superlock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/test_superlock.c') diff --git a/src/test_superlock.c b/src/test_superlock.c index cad5b51f0..45d0d623a 100644 --- a/src/test_superlock.c +++ b/src/test_superlock.c @@ -260,6 +260,9 @@ int sqlite3demo_superlock( # include "sqlite_tcl.h" #else # include "tcl.h" +# ifndef SQLITE_TCLAPI +# define SQLITE_TCLAPI +# endif #endif struct InterpAndScript { @@ -268,11 +271,11 @@ struct InterpAndScript { }; typedef struct InterpAndScript InterpAndScript; -static void superunlock_del(ClientData cd){ +static void SQLITE_TCLAPI superunlock_del(ClientData cd){ sqlite3demo_superunlock((void *)cd); } -static int superunlock_cmd( +static int SQLITE_TCLAPI superunlock_cmd( ClientData cd, Tcl_Interp *interp, int objc, @@ -304,7 +307,7 @@ static int superlock_busy(void *pCtx, int nBusy){ /* ** Tclcmd: sqlite3demo_superlock CMDNAME PATH VFS BUSY-HANDLER-SCRIPT */ -static int superlock_cmd( +static int SQLITE_TCLAPI superlock_cmd( ClientData cd, Tcl_Interp *interp, int objc, -- cgit v1.2.3