Work around an issue with the WINSCW compiler. (CVS 5671)

FossilOrigin-Name: e333c3f4c3629dba05b58318e2cd0514843e5394

diff --git a/manifest b/manifest
index 34802db204b99f8f274d8f5d30a37e66db7c0f95..8fdc301251c216afe8f4cd0e72a4e196ef5e177b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sdefault\sthreading\smode\smultithread\s(-nomutex)\sin\sthe\sTCL\sinterface.\s(CVS\s5670)
-D 2008-09-03T01:08:01
+C Work\saround\san\sissue\swith\sthe\sWINSCW\scompiler.\s(CVS\s5671)
+D 2008-09-03T17:11:16
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,11 +103,11 @@ F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
 F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
 F src/callback.c cfc8d4f95fd831e25532d0fee2af5306283f4835
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
-F src/date.c 6609557446f2d6788e64e18c09e03fdaf4dd55cc
+F src/date.c 5c092296c03d658e84884121a694150964d6861d
 F src/delete.c bae6684aa02e1f7cf6328023157c91d9cf94200b
 F src/expr.c 6413795aa13ceb05994e6b2b453a77df3b892e7b
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
-F src/func.c 41a4cbbc439935f2106a621a689ed02b1ed0324f
+F src/func.c 8431b40a7843d1024145684d303c55b4ee087bbe
 F src/global.c 9ced7c26127f04fb4baaebed1f5bf6d7063b089f
 F src/hash.c eb64e48f3781100e5934f759fbe72a63a8fe78cb
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
@@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P f2f361a5e2fb81fb0f99e83ecf8bae9a750723b1
-R 705577649ea0352c58c4fc8568a84665
+P d9e826942673ad048d611c014bfbee39ab5535c8
+R 4c58f8d518f4d7642e26335d639dedc9
 U drh
-Z 89560b732b51adcb2b255247e55584a1
+Z 9a733289185c8757aa19d0d86da78658

diff --git a/manifest.uuid b/manifest.uuid
index f74c55a6e2b392acc7a03821a6178787ee6a4405..93db9dd96a8f7adf6d8ce336ff155dd2a6131a1c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d9e826942673ad048d611c014bfbee39ab5535c8
\ No newline at end of file
+e333c3f4c3629dba05b58318e2cd0514843e5394
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 53fe4a1e1b3f9a060854e0b16e7e8ad974f00857..c93b8e14a13d655fb8f035afc9e49285f97b8433 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.89 2008/09/01 18:34:20 danielk1977 Exp $
+** $Id: date.c,v 1.90 2008/09/03 17:11:16 drh Exp $
 **
 ** SQLite processes all times and dates as Julian Day numbers.  The
 ** dates and times are stored as the number of days since noon
@@ -1071,7 +1071,7 @@ void sqlite3RegisterDateTimeFunctions(void){
   };
   int i;
   FuncDefHash *pHash = &GLOBAL(FuncDefHash, sqlite3GlobalFunctions);
-  FuncDef *aFunc = &GLOBAL(FuncDef, aDateTimeFuncs);
+  FuncDef *aFunc = (FuncDef*)&GLOBAL(FuncDef, aDateTimeFuncs);
 
   for(i=0; i<ArraySize(aDateTimeFuncs); i++){
     sqlite3FuncDefInsert(pHash, &aFunc[i]);

diff --git a/src/func.c b/src/func.c
index 425020cd41e8fe6daeb401640678cd426224f80c..794950518612c0309efcd5f5abb190c1b8527996 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.202 2008/09/02 15:44:09 danielk1977 Exp $
+** $Id: func.c,v 1.203 2008/09/03 17:11:16 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1376,7 +1376,7 @@ void sqlite3RegisterGlobalFunctions(void){
 
   int i;
   FuncDefHash *pHash = &GLOBAL(FuncDefHash, sqlite3GlobalFunctions);
-  FuncDef *aFunc = &GLOBAL(FuncDef, aBuiltinFunc);
+  FuncDef *aFunc = (FuncDef*)&GLOBAL(FuncDef, aBuiltinFunc);
 
   for(i=0; i<ArraySize(aBuiltinFunc); i++){
     sqlite3FuncDefInsert(pHash, &aFunc[i]);