Typecast to silence (incorrect) compiler warning. (CVS 3054)

FossilOrigin-Name: 3a04fc45ccc31f2009be812a9c9057844cf4ae3b

diff --git a/manifest b/manifest
index 802b1adcd68347a37368a0d4c36f6cb2ee951b55..0313f5bbbff578c50ae3c7c255af49c62f00b939 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\sregister\sBINARY\scollating\ssequences\sfor\sUTF-16BE\sand\sUTF-16LE\sboth.\nFormerly\swe\swere\sonly\sregistering\sthe\snative\sbyte\sorder\sby\sdefault.\nTicket\s#1654.\s\sNote:\s\sThere\smay\sstill\sbe\sproblems\swith\scollating\ssequence\nsynthesis.\s(CVS\s3053)
-D 2006-02-01T13:50:42
+C Typecast\sto\ssilence\s(incorrect)\scompiler\swarning.\s(CVS\s3054)
+D 2006-02-01T14:39:54
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -52,7 +52,7 @@ F src/main.c ce5b9f0af959b6c7dc14c42815edd28e2153621b
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
-F src/os_common.h 061fba8511a656b118551424f64e366ad0d4cb3b
+F src/os_common.h 108cd719c96a2b714b64e02aeabbd40684274e6a
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 9de1887768d94a63a4043ad487dd1c595437488e
@@ -350,7 +350,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 248b9be93d9532e31c640432b75c3310e180acb3
-R 859a862fe83457f62502860af9a0f719
+P 3861377bd93453161dfe78a8c1d7a9f919108c8f
+R 78a86cbfd57b747b084835fa422857b1
 U drh
-Z b0413d62db13b211c799ec334f107158
+Z 9d78210638014b4103d9be21859c7794

diff --git a/manifest.uuid b/manifest.uuid
index 75a6e56b6a0fb66e58485218d109e4a767331732..15f9aff1ec9c9c7144bae2776ac5e6e4347b4870 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3861377bd93453161dfe78a8c1d7a9f919108c8f
\ No newline at end of file
+3a04fc45ccc31f2009be812a9c9057844cf4ae3b
\ No newline at end of file

diff --git a/src/os_common.h b/src/os_common.h
index b83a02b7c4608f0b4152df8c2df0224dedec88f1..d65c352ddfc77768cf0eb2ffd59a812b272c9870 100644 (file)
--- a/src/os_common.h
+++ b/src/os_common.h
@@ -155,7 +155,7 @@ void *sqlite3GenericMalloc(int n){
 void *sqlite3GenericRealloc(void *p, int n){
   char *p2 = ((char *)p - 8);
   assert(n>0);
-  p2 = realloc(p2, n+8);
+  p2 = (char*)realloc(p2, n+8);
   if( p2 ){
     *(int *)p2 = n;
     p2 += 8;