From: shaneh <shaneh@noemail.net>
Date: Mon, 4 Oct 2010 14:11:54 +0000 (+0000)
Subject: Warning cleanup from MSVC.
X-Git-Tag: version-3.7.4~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b03f21e4f5b0ed3d9756f08970a1b5e1e194197;p=thirdparty%2Fsqlite.git

Warning cleanup from MSVC.

FossilOrigin-Name: cde62657d6f410a3d6899cd7b4000d276fe3c813
---

diff --git a/manifest b/manifest
index 815d6b8f06..ffdcc7087b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbroken\sevidence\smarks\sin\se_expr.test.
-D 2010-10-04T11:01:18
+C Warning\scleanup\sfrom\sMSVC.
+D 2010-10-04T14:11:55
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -141,7 +141,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8
 F src/main.c da74b2269470d97a702d2956eeeb691a5e3a68c3
-F src/malloc.c 455f9d671a3798b7678e081283fbd42ccc2bf5d4
+F src/malloc.c 3d7284cd9346ab6e3945535761e68c23c6cf40ef
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 70f511872e938e096537fb0ca097ccdd3b33becc
-R 7644a9438430bba38c1e4757af53d104
-U dan
-Z bfe6c46a25cfa7c78b09b27fcc3de0d8
+P 37ff94cec8a50d42c18f2253541bbcb0a6dfd0c3
+R 72991b4ede8e55d39ffb9e07792fd2bb
+U shaneh
+Z 79d1b17c2284822681a738edba5666f3
diff --git a/manifest.uuid b/manifest.uuid
index e2fa3b12e5..6e1d9ea39c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-37ff94cec8a50d42c18f2253541bbcb0a6dfd0c3
\ No newline at end of file
+cde62657d6f410a3d6899cd7b4000d276fe3c813
\ No newline at end of file
diff --git a/src/malloc.c b/src/malloc.c
index d23d91db54..2c78979498 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -142,7 +142,7 @@ sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 n){
     sqlite3MemoryAlarm(0, 0, 0);
   }
   excess = sqlite3_memory_used() - n;
-  if( excess>0 ) sqlite3_release_memory(excess & 0x7fffffff);
+  if( excess>0 ) sqlite3_release_memory((int)(excess & 0x7fffffff));
   return priorLimit;
 }
 void sqlite3_soft_heap_limit(int n){