Fix another compiler warning in the test logic of tclsqlite.c. (CVS 6393)

FossilOrigin-Name: 47ffc4dca8f106d0da8cbc0a8ff7453016e9b40d

diff --git a/manifest b/manifest
index 5f448ccb5b87a79bb23d0b865102af9c2494c1f6..7e1b00011a0c33b12135e1f4b27f090b2a173cce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\scompiler\swarnings\sin\stest\scode.\s(CVS\s6392)
-D 2009-03-27T12:32:55
+C Fix\sanother\scompiler\swarning\sin\sthe\stest\slogic\sof\stclsqlite.c.\s(CVS\s6393)
+D 2009-03-27T12:44:35
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,7 +163,7 @@ F src/sqliteInt.h 7fe33227434a3e54e3056cbe95800bd09a636fbe
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
-F src/tclsqlite.c 37d34e4131845584940d04729a18fc8441a7d35d
+F src/tclsqlite.c d3195e0738c101a155404ecdb1cd9532a2fd34f2
 F src/test1.c fc09299ecf3e7d1235293ba43dcc7ea003240a54
 F src/test2.c 71c22e2974f8094fe0fd1eba8f27872dde9b2a39
 F src/test3.c d3115b301c6ee761b102f315fe24125f3d6c3a4d
@@ -710,7 +710,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 6762625d29d5e0053afdad033fe54e2d9121046a
-R b604a9da188edcf7941d8804ba52fd05
+P a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434
+R e60e82e5515f1b7218767f55150bf743
 U drh
-Z 602f07abcb75475a1190577a6bb558d7
+Z 551dbae88da7e0915e39aab6d2459b60

diff --git a/manifest.uuid b/manifest.uuid
index 4309c9c57306ccf9a51d0fe2b24e637f08ca9aed..1b0b72e3ed9caed65b4e57966c8bf9032bfc29b9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434
\ No newline at end of file
+47ffc4dca8f106d0da8cbc0a8ff7453016e9b40d
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 854bbb0f0c2e49ea94ae59664893179a7d25626d..4c6c5fc312a5475c3ba6878940185d869c821344 100644 (file)
--- 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.240 2009/03/27 12:32:55 drh Exp $
+** $Id: tclsqlite.c,v 1.241 2009/03/27 12:44:35 drh Exp $
 */
 #include "tcl.h"
 #include <errno.h>
@@ -575,7 +575,7 @@ static void DbRollbackHandler(void *clientData){
   }
 }
 
-#ifdef SQLITE_TEST
+#if defined(SQLITE_TEST) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
 static void setTestUnlockNotifyVars(Tcl_Interp *interp, int iArg, int nArg){
   char zBuf[64];
   sprintf(zBuf, "%d", iArg);
@@ -584,7 +584,7 @@ static void setTestUnlockNotifyVars(Tcl_Interp *interp, int iArg, int nArg){
   Tcl_SetVar(interp, "sqlite_unlock_notify_argcount", zBuf, TCL_GLOBAL_ONLY);
 }
 #else
-  #define setTestUnlockNotifyVars(x,y,z)
+# define setTestUnlockNotifyVars(x,y,z)
 #endif
 
 #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY