From: shane <shane@noemail.net>
Date: Mon, 24 Nov 2008 20:05:38 +0000 (+0000)
Subject: Added cast to PAGE_TO_PGHDR1 macro to remove warning.  It looks like despite the... 
X-Git-Tag: version-3.6.10~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46fdc8f586440e807d725f9330bce605470fbf48;p=thirdparty%2Fsqlite.git

Added cast to PAGE_TO_PGHDR1 macro to remove warning.  It looks like despite the warning, the compiler (tested with VS2005 and GCC on Windows) was doing the right thing.  Ticket #3510. (CVS 5953)

FossilOrigin-Name: e93cec0a72c7c330e63d38d683f4c8b63e0f8070
---

diff --git a/manifest b/manifest
index 609b05429c..1b92125967 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\ssome\sspelling\serrors\sin\ssqliteInt.h.\s\sTicket\s#3509.\s(CVS\s5952)
-D 2008-11-24T20:01:33
+C Added\scast\sto\sPAGE_TO_PGHDR1\smacro\sto\sremove\swarning.\s\sIt\slooks\slike\sdespite\sthe\swarning,\sthe\scompiler\s(tested\swith\sVS2005\sand\sGCC\son\sWindows)\swas\sdoing\sthe\sright\sthing.\s\sTicket\s#3510.\s(CVS\s5953)
+D 2008-11-24T20:05:39
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0aa7bbe3be6acc4045706e3bb3fd0b8f38f4a3b5
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -144,7 +144,7 @@ F src/pager.h a02ef8e6cc7e78b54874166e5ce786c9d4c489bf
 F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe
 F src/pcache.c f3121a531745b20f5b824201eb63949a7e2959ac
 F src/pcache.h f20c3e82dd6da622c3fe296170cb1801f9a2d75a
-F src/pcache1.c 2453a3e925841fdb610f39bba24def8b2ad4a908
+F src/pcache1.c d8d412326cc5123ba3bfaa66e36205ca8c5dbc5e
 F src/pragma.c 539e28c90e782fa909a3b3a6849d18a9eb11a548
 F src/prepare.c fcadb25d2ad722d87103517333c825b56b79a770
 F src/printf.c e29d9475c63e1dbfae005b98da3a60e07b5c1ca5
@@ -662,7 +662,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8502fba37bb13c019252d0a65973a78982ec44aa
-R c7b13a46f15e8057cff1369cc33b7dfb
+P 7e134a5c1a9f103abd9d655483ad54cffae7e3ef
+R e05b777dd1cc800a136d32d50fffdbd5
 U shane
-Z d4670883a93a1c5b520440ba970db22a
+Z a902d82e544694dcd73d59511a9b23de
diff --git a/manifest.uuid b/manifest.uuid
index 15ecef6492..cfbc192e8c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e134a5c1a9f103abd9d655483ad54cffae7e3ef
\ No newline at end of file
+e93cec0a72c7c330e63d38d683f4c8b63e0f8070
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 86df888560..8140f99672 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -16,7 +16,7 @@
 ** If the default page cache implementation is overriden, then neither of
 ** these two features are available.
 **
-** @(#) $Id: pcache1.c,v 1.3 2008/11/19 09:05:27 danielk1977 Exp $
+** @(#) $Id: pcache1.c,v 1.4 2008/11/24 20:05:39 shane Exp $
 */
 
 #include "sqliteInt.h"
@@ -108,7 +108,7 @@ static SQLITE_WSD struct PCacheGlobal {
 **   assert( PGHDR1_TO_PAGE(PAGE_TO_PGHDR1(X))==X );
 */
 #define PGHDR1_TO_PAGE(p) (void *)(&((unsigned char *)p)[sizeof(PgHdr1)])
-#define PAGE_TO_PGHDR1(p) (PgHdr1 *)(&((unsigned char *)p)[-1*sizeof(PgHdr1)])
+#define PAGE_TO_PGHDR1(p) (PgHdr1 *)(&((unsigned char *)p)[-1*(int)sizeof(PgHdr1)])
 
 /*
 ** Macros to enter and leave the global LRU mutex.