From: shaneh Date: Mon, 20 Jun 2011 20:50:49 +0000 (+0000) Subject: Fix a couple of compiler issues on Windows due to warning clean up. X-Git-Tag: version-3.7.7~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e2f36b4ed44a8f2d616dcc89ac5547dd31be5d8;p=thirdparty%2Fsqlite.git Fix a couple of compiler issues on Windows due to warning clean up. FossilOrigin-Name: 81e6f151d384fa1f1474175b39ad6dfa64f8da0d --- diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 05564f7849..2cbcbff89e 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -2680,8 +2680,8 @@ static int fts3SyncMethod(sqlite3_vtab *pVtab){ ** Implementation of xBegin() method. This is a no-op. */ static int fts3BeginMethod(sqlite3_vtab *pVtab){ - UNUSED_PARAMETER(pVtab); TESTONLY( Fts3Table *p = (Fts3Table*)pVtab ); + UNUSED_PARAMETER(pVtab); assert( p->pSegments==0 ); assert( p->nPendingData==0 ); assert( p->inTransaction!=1 ); @@ -2696,8 +2696,8 @@ static int fts3BeginMethod(sqlite3_vtab *pVtab){ ** by fts3SyncMethod(). */ static int fts3CommitMethod(sqlite3_vtab *pVtab){ - UNUSED_PARAMETER(pVtab); TESTONLY( Fts3Table *p = (Fts3Table*)pVtab ); + UNUSED_PARAMETER(pVtab); assert( p->nPendingData==0 ); assert( p->inTransaction!=0 ); assert( p->pSegments==0 ); diff --git a/manifest b/manifest index 8bb943e2f3..263e473734 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sadditional\serror\scheck\sfor\sdisk\sfull\son\sWindows. -D 2011-06-20T20:48:09.429 +C Fix\sa\scouple\sof\scompiler\sissues\son\sWindows\sdue\sto\swarning\sclean\sup. +D 2011-06-20T20:50:49.490 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -62,7 +62,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c f63086fc75c3b70025f2917d211c1b5ea0d41113 +F ext/fts3/fts3.c 1c8a45dfd6836e7dea0307008079793ac0fc3b68 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h fa493ccbad78a2c99ad1c984f651c0c202e68536 F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 -R 36f6f0e4631f704d65d595ab5602f5ae +P 3ee5d1a51d6347858734b7b595771ae9cd2cc89d +R 38b91ba83a0690d05159e3865af95b9c U shaneh -Z 2fbdfbb10586425f4553f2f3aade499b +Z 2b8dce98f298f90cca367918eb5b7523 diff --git a/manifest.uuid b/manifest.uuid index 805aa05c23..09c8cdcb30 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3ee5d1a51d6347858734b7b595771ae9cd2cc89d \ No newline at end of file +81e6f151d384fa1f1474175b39ad6dfa64f8da0d \ No newline at end of file