From: mistachkin Date: Tue, 4 Dec 2012 00:37:58 +0000 (+0000) Subject: Fix an out-of-order function declaration when compiled with MEMDEBUG. X-Git-Tag: version-3.7.15~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a359b5eea45790fb412dcab933223ceac8329d1f;p=thirdparty%2Fsqlite.git Fix an out-of-order function declaration when compiled with MEMDEBUG. FossilOrigin-Name: 6d31557837fef2c8fad6f009ac6dd97dd4af0a54 --- diff --git a/manifest b/manifest index 60900d200c..982371eb75 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sunreachable\scondition.\s\sReplace\sit\swith\san\sassert(). -D 2012-12-03T19:42:39.167 +C Fix\san\sout-of-order\sfunction\sdeclaration\swhen\scompiled\swith\sMEMDEBUG. +D 2012-12-04T00:37:58.757 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -208,7 +208,7 @@ F src/test_intarray.c 07ddcebe4097d400ffca362770f1d883c112387a F src/test_intarray.h b999bb18d090b8d9d9c49d36ec37ef8f341fe169 F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e -F src/test_malloc.c 01cd65ae7ae93de9fbf8214d1ee6b4eba4850700 +F src/test_malloc.c 6982a357a6a6c24f281b91c89303a5c31075c392 F src/test_multiplex.c ac0fbc1748e5b86a41a1d7a84654fae0d53a881d F src/test_multiplex.h 9b63b95f07acedee425fdfe49a47197c9bf5f9d8 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e @@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P b0c1ba655d69c0c46c16ea2aef4e6c9a3e6ce3fb -R b849c716d2b2c058f619a22bc4f40fe8 -U drh -Z 0f893cca86d4c59ca9756d8f8e113fff +P 7d5fc1a339cf4f3597ab6a5f3e7101884d2d7673 +R 51b08a3d6b6d9647118accff35071b4d +U mistachkin +Z e9663e5c6dfd0808fc144666962de0b7 diff --git a/manifest.uuid b/manifest.uuid index fd0b82143f..a5c0c5c571 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7d5fc1a339cf4f3597ab6a5f3e7101884d2d7673 \ No newline at end of file +6d31557837fef2c8fad6f009ac6dd97dd4af0a54 \ No newline at end of file diff --git a/src/test_malloc.c b/src/test_malloc.c index e1420de648..33de859d27 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -720,8 +720,8 @@ static int test_memdebug_settitle( #ifdef SQLITE_MEMDEBUG { const char *zTitle; - zTitle = Tcl_GetString(objv[1]); extern int sqlite3MemdebugSettitle(const char*); + zTitle = Tcl_GetString(objv[1]); sqlite3MemdebugSettitle(zTitle); } #endif