aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2009-03-27 12:32:54 +0000
committerdrh <drh@noemail.net>2009-03-27 12:32:54 +0000
commit69910da997fa3973ef71aa1d94a93494da800fb8 (patch)
tree53a4a7df97820990743a122ebf6909dcaced0c6b /src
parent62e5a81a5a92cec6498e2e85b9e8a16c4ca66535 (diff)
downloadsqlite-69910da997fa3973ef71aa1d94a93494da800fb8.tar.gz
sqlite-69910da997fa3973ef71aa1d94a93494da800fb8.zip
Fix some compiler warnings in test code. (CVS 6392)
FossilOrigin-Name: a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434
Diffstat (limited to 'src')
-rw-r--r--src/tclsqlite.c4
-rw-r--r--src/test1.c4
-rw-r--r--src/test_thread.c6
3 files changed, 10 insertions, 4 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 8959e6074..854bbb0f0 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -12,7 +12,7 @@
** A TCL Interface to SQLite. Append this file to sqlite3.c and
** compile the whole thing to build a TCL-enabled version of SQLite.
**
-** $Id: tclsqlite.c,v 1.239 2009/03/24 15:08:10 drh Exp $
+** $Id: tclsqlite.c,v 1.240 2009/03/27 12:32:55 drh Exp $
*/
#include "tcl.h"
#include <errno.h>
@@ -587,6 +587,7 @@ static void setTestUnlockNotifyVars(Tcl_Interp *interp, int iArg, int nArg){
#define setTestUnlockNotifyVars(x,y,z)
#endif
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
static void DbUnlockNotify(void **apArg, int nArg){
int i;
for(i=0; i<nArg; i++){
@@ -599,6 +600,7 @@ static void DbUnlockNotify(void **apArg, int nArg){
pDb->pUnlockNotify = 0;
}
}
+#endif
static void DbUpdateHandler(
void *p,
diff --git a/src/test1.c b/src/test1.c
index e3e8df143..0fe3e28b1 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
**
-** $Id: test1.c,v 1.348 2009/03/16 13:19:36 danielk1977 Exp $
+** $Id: test1.c,v 1.349 2009/03/27 12:32:55 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -4835,12 +4835,14 @@ static int test_pcache_stats(
return TCL_OK;
}
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
static void test_unlock_notify_cb(void **aArg, int nArg){
int ii;
for(ii=0; ii<nArg; ii++){
Tcl_EvalEx((Tcl_Interp *)aArg[ii], "unlock_notify", -1, TCL_EVAL_GLOBAL);
}
}
+#endif /* SQLITE_ENABLE_UNLOCK_NOTIFY */
/*
** tclcmd: sqlite3_unlock_notify db
diff --git a/src/test_thread.c b/src/test_thread.c
index 2507e5f55..fc372a292 100644
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -14,7 +14,7 @@
** test that sqlite3 database handles may be concurrently accessed by
** multiple threads. Right now this only works on unix.
**
-** $Id: test_thread.c,v 1.14 2009/03/24 18:42:16 drh Exp $
+** $Id: test_thread.c,v 1.15 2009/03/27 12:32:56 drh Exp $
*/
#include "sqliteInt.h"
@@ -55,8 +55,10 @@ struct EvalEvent {
static Tcl_ObjCmdProc sqlthread_proc;
static Tcl_ObjCmdProc clock_seconds_proc;
+#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
static Tcl_ObjCmdProc blocking_step_proc;
static Tcl_ObjCmdProc blocking_prepare_v2_proc;
+#endif
int Sqlitetest1_Init(Tcl_Interp *);
/* Functions from test1.c */
@@ -599,7 +601,7 @@ static int blocking_prepare_v2_proc(
return TCL_OK;
}
-#endif
+#endif /* SQLITE_OS_UNIX && SQLITE_ENABLE_UNLOCK_NOTIFY */
/*
** End of implementation of [sqlite3_blocking_step].
************************************************************************/