Work around a bug in GCC 4.0.2. (CVS 3154)

FossilOrigin-Name: fe0920c7922bfdbefbc0107fb9170d98bec2dcef

diff --git a/manifest b/manifest
index 2704a348fa2349a22e9969c4b70b92c33be523a3..60c7aebf33b270e19f46eeefeb61ee42f6873273 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C SQLite\snow\salways\schooses\sthe\scolumn\snames\sfor\scompound\sselects\susing\nthe\sleft-most\sselect.\s\sThis\smakes\sSQLite\swork\slike\sother\sSQL\sdatabase,\nbut\sit\salso\sis\sa\schange\sfrom\shistorical\sbehavior\sand\smay\sbreak\ssome\nscripts.\s\sTicket\s#1721.\s(CVS\s3153)
-D 2006-03-26T01:21:23
+C Work\saround\sa\sbug\sin\sGCC\s4.0.2.\s(CVS\s3154)
+D 2006-03-26T20:49:18
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -59,7 +59,7 @@ F src/os_unix.c 35ad4d81c90800f509d28580742b67906d289223
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 8ced9ac82670bbf77492961a2f7ff80a87f1404f
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 0b34f79119dfd302e371f5f172f434613336ca67
+F src/pager.c 33186636a07eeaf34028083c32b27b9647556be7
 F src/pager.h 43f32f3847421f7502cfbb66f4eb2302b8033818
 F src/parse.y ee1887ce0e6eea15cc728913ad3462898f88e9b0
 F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P c83ec81d53f756660cafbbdaf9cf92e9e4bab4ad
-R 3cde0732a4aff50430bbc2aaeb80af28
+P 80cda9f7ce83f2de6cd2fdaf6150bbc35b670fee
+R d92806f8ad5b57a82422a1562ac3eefb
 U drh
-Z 51ed0eb85034f61e3452cfde62b62d0e
+Z cb468a32b49079c6cdf556c3d07ea774

diff --git a/manifest.uuid b/manifest.uuid
index 86e432d4c0a5de448ba566779ca919540c3aa0ff..a057a4d38fe6b72f38a0d3c0afe5bc769ce87bc6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80cda9f7ce83f2de6cd2fdaf6150bbc35b670fee
\ No newline at end of file
+fe0920c7922bfdbefbc0107fb9170d98bec2dcef
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index e23bc0538ab91be86fa84aeb0131c15e365a1c61..0504ecc0e8561766149fc260b5fe35d19bda8d21 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.264 2006/03/23 23:29:04 drh Exp $
+** @(#) $Id: pager.c,v 1.265 2006/03/26 20:49:18 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1809,6 +1809,7 @@ int sqlite3pager_pagecount(Pager *pPager){
 ** Forward declaration
 */
 static int syncJournal(Pager*);
+static void clearHistory(PgHistory*);
 
 
 /*
@@ -1834,7 +1835,6 @@ static void unlinkHashChain(Pager *pPager, PgHdr *pPg){
     pPager->aHash[h] = pPg->pNextHash;
   }
   if( MEMDB ){
-    static void clearHistory(PgHistory*);  /* Forward reference */
     clearHistory(PGHDR_TO_HIST(pPg, pPager));
   }
   pPg->pgno = 0;