Add a typecast to work around a bug in the Metrowerks Code Warrior compiler.

Ticket #553. (CVS 1161)

FossilOrigin-Name: 4146f8cc3ff5339b5685e9c5121888ae08ee0807

diff --git a/manifest b/manifest
index 1fbcf882bebd6fcdea03e36b5d894e85ef43696a..0399378baf2db187a42bd67ec193491c73c3c261 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.8.9\s(CVS\s1160)
-D 2004-01-06T02:23:46
+C Add\sa\stypecast\sto\swork\saround\sa\sbug\sin\sthe\sMetrowerks\sCode\sWarrior\scompiler.\nTicket\s#553.\s(CVS\s1161)
+D 2004-01-07T02:52:08
 F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -40,7 +40,7 @@ F src/main.c 3dd3cae00bade294011da5a3cf9ff660a610c545
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c d5a13117cebbef36a5e986783d0a144afc5df7d1
 F src/os.h 4101ce267c2f5c8a34914e6af122e97907fcb205
-F src/pager.c ca24fced1ca4c2b8ea519d5fe8ec69a2d846276f
+F src/pager.c 289328d8efba620eae99f6c2f6062710838a3eb4
 F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
 F src/parse.y c65aa6c5508763806ac9734b0589b93480ec7e7a
 F src/pragma.c deec7342741e371f3042adaee53fcc324c5dd1d4
@@ -179,7 +179,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 532170d4b8fc7a4e596a817257e9e1f81d364940
-R 8b39439d9668f97077082784fdb205dc
+P d8ae6bddeb70f1450ccd3a4735ccf6fe3a042a07
+R 222692c9664863c079a68bd8b44e806b
 U drh
-Z fb0243310264d5fdc6ca372657708053
+Z 7366c12e01e2442c1baac6232f5fd274

diff --git a/manifest.uuid b/manifest.uuid
index 55b56b9dc915c7c56133249ec7f5cb837438eb42..b4d49cbf98ea4a2b0f46f4731549d4833b5a19ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d8ae6bddeb70f1450ccd3a4735ccf6fe3a042a07
\ No newline at end of file
+4146f8cc3ff5339b5685e9c5121888ae08ee0807
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 0dfbc7fcf5da0ddc49e471b2b940b9ac553b3e44..605dc0d320b1e412827525973a7e6f46db896df6 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.91 2003/12/17 23:57:35 drh Exp $
+** @(#) $Id: pager.c,v 1.92 2004/01/07 02:52:08 drh Exp $
 */
 #include "os.h"         /* Must be first to enable large file support */
 #include "sqliteInt.h"
@@ -594,7 +594,7 @@ static int pager_playback(Pager *pPager, int useJournalSize){
     goto end_playback;
   }
   if( format>=JOURNAL_FORMAT_3 ){
-    rc = read32bits(format, &pPager->jfd, &nRec);
+    rc = read32bits(format, &pPager->jfd, (u32*)&nRec);
     if( rc ) goto end_playback;
     rc = read32bits(format, &pPager->jfd, &pPager->cksumInit);
     if( rc ) goto end_playback;