From: shane <shane@noemail.net>
Date: Fri, 30 Jan 2009 16:09:22 +0000 (+0000)
Subject: Made code to remove unused parameter warning part of the conditional.  Ticket #3610... 
X-Git-Tag: version-3.6.15~531
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a38964b501bdc27e82464cba775bc708da68093;p=thirdparty%2Fsqlite.git

Made code to remove unused parameter warning part of the conditional.  Ticket #3610. (CVS 6219)

FossilOrigin-Name: c5dca1146de72071ed2e5fdf6890f41682272587
---

diff --git a/manifest b/manifest
index ffcb28f1e3..3da48e9607 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\ssetupLookaside()\sin\smain.c\sto\sbetter\shandle\slookaside\sbuffer\sconfigurations\sof\szero-size.\s\sTicket\s#3616.\s(CVS\s6218)
-D 2009-01-30T06:11:55
+C Made\scode\sto\sremove\sunused\sparameter\swarning\spart\sof\sthe\sconditional.\s\sTicket\s#3610.\s(CVS\s6219)
+D 2009-01-30T16:09:23
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 3871d308188cefcb7c5ab20da4c7b6aad023bc52
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
 F src/mutex_os2.c 6b5a74f812082a8483c3df05b47bbaac2424b9a0
 F src/mutex_unix.c 2f936339dfef1a4c142db290d575a3509b77315f
-F src/mutex_w32.c bd473df1d9253fc105709e208239b474b7961996
+F src/mutex_w32.c f4b6a4a48f1dfff7f0089cba9b5a371691f17b8b
 F src/os.c ed93a6b46132a602c4fd7a58142e2981c829c79d
 F src/os.h f996ab57d2035a20e63173419055608548a834c6
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
@@ -693,7 +693,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 9ea871f3e8ce1ec5cffb72f13704c3002d3f5383
-R bda281c14bbdb7d7dba2a062068f24de
+P 0a2c7f740397c5c6373434c75d73c2714f14dd32
+R 649046167725b542f7b218aebaf5f5d8
 U shane
-Z 650ab35123eaec11247543bf155740af
+Z 487e1bd5693e1aade7bfd1bf63c7b518
diff --git a/manifest.uuid b/manifest.uuid
index e560ae0403..e8922d3936 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a2c7f740397c5c6373434c75d73c2714f14dd32
\ No newline at end of file
+c5dca1146de72071ed2e5fdf6890f41682272587
\ No newline at end of file
diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index 33a355c7fd..eeb2d798f7 100644
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for win32
 **
-** $Id: mutex_w32.c,v 1.14 2009/01/30 05:40:27 shane Exp $
+** $Id: mutex_w32.c,v 1.15 2009/01/30 16:09:23 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -195,7 +195,6 @@ static void winMutexEnter(sqlite3_mutex *p){
 }
 static int winMutexTry(sqlite3_mutex *p){
   int rc = SQLITE_BUSY;
-  UNUSED_PARAMETER(p);
   assert( p->id==SQLITE_MUTEX_RECURSIVE || winMutexNotheld(p) );
   /*
   ** The sqlite3_mutex_try() routine is very rarely used, and when it
@@ -214,6 +213,8 @@ static int winMutexTry(sqlite3_mutex *p){
     p->nRef++;
     rc = SQLITE_OK;
   }
+#else
+  UNUSED_PARAMETER(p);
 #endif
   return rc;
 }