From: shaneh Date: Fri, 15 Apr 2011 19:30:42 +0000 (+0000) Subject: Remove stray semi-colon that MSVC complained about. X-Git-Tag: version-3.7.7~154 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca591feb34f83391703ae840f2431fa81b57a17c;p=thirdparty%2Fsqlite.git Remove stray semi-colon that MSVC complained about. FossilOrigin-Name: 7a085271ff85033479c2057c19a45a750168d228 --- diff --git a/manifest b/manifest index edb5d1fb40..c066fda266 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sto\smemory\sallocator\susage\stracking\sto\sdelay\sthe\sonset\sof\sinteger\noverflow. -D 2011-04-15T16:39:52.779 +C Remove\sstray\ssemi-colon\sthat\sMSVC\scomplained\sabout. +D 2011-04-15T19:30:42.292 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -144,7 +144,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85 F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e -F src/malloc.c d9cdb1fccae9a6b7f40bbfc781bc378e7405f9c9 +F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf @@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P a8761a9128de945aa4b6196df5ffe64115d66b61 -R 2fa8b4a986eeacdbbe17a46e5b0c10d7 -U drh -Z f0ea562c57300e5a2ab554fa5ecd70be +P 4e33a0eaf83922926f8d5ee988a20439a09bc795 +R 1de3aeee08a0a0eaf4ebc036e17c7731 +U shaneh +Z 5caf2116092f11c160fc67dc57f30878 diff --git a/manifest.uuid b/manifest.uuid index d538b1b6ef..a6411ae299 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4e33a0eaf83922926f8d5ee988a20439a09bc795 \ No newline at end of file +7a085271ff85033479c2057c19a45a750168d228 \ No newline at end of file diff --git a/src/malloc.c b/src/malloc.c index 623d7e855a..3585f1245d 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -507,7 +507,7 @@ void sqlite3DbFree(sqlite3 *db, void *p){ ** Change the size of an existing memory allocation */ void *sqlite3Realloc(void *pOld, int nBytes){ - int nOld, nNew, nDiff;; + int nOld, nNew, nDiff; void *pNew; if( pOld==0 ){ return sqlite3Malloc(nBytes); /* IMP: R-28354-25769 */