Fix compilation error when neither MEMDEBUG or ENABLE_MEMORY_MANAGEMENT is enabled...

FossilOrigin-Name: 4de5c52920c94e2a29ef4b68eb8b990c63005b3d

diff --git a/manifest b/manifest
index fbab08439720f42d2a1d17897dbf95cc1cf4f1d7..80a628a78cee86c942239e1cc0ea6aad4438df36 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\ssqlite3MallocClearFailed()\scalls\sto\ssqlite3ApiExit(),\sa\sbetter\sAPI.\s(CVS\s2970)
-D 2006-01-18T15:25:17
+C Fix\scompilation\serror\swhen\sneither\sMEMDEBUG\sor\sENABLE_MEMORY_MANAGEMENT\sis\senabled.\s(CVS\s2971)
+D 2006-01-18T15:39:26
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -85,7 +85,7 @@ F src/tokenize.c 8b694d42b48f22c2037da7e1e716201aaaaa0f3a
 F src/trigger.c 694b247476d2fc0dce003af564f79e8752fc1158
 F src/update.c 261d75c702c2852d1a64274d7c414485e6f2d177
 F src/utf.c 5ab8ca05d4e9ec81174b010f01ab12a232f0087d
-F src/util.c 28f399a6e3b4b55caf635f1941ee2391072d1a78
+F src/util.c 6279cd70acf72a2ffbdde6687308b2c4a78a31d4
 F src/vacuum.c 21a3c7f6f7be86bb1182fbc3df416ad702435b9e
 F src/vdbe.c 3db9bfc86e71dc0758524fb82cfcfd4c30e92716
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
@@ -341,7 +341,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P dd3e07cae4d0cbd4f8977e1dd11e0103e0e45b75
-R baef608325fb18b2b8e10ab8f84cb339
+P e0b022e5b2bfd272b4e25cd7a7b472206a118bbe
+R 7709fb3df59a2ebde787dbfcd1a5adf3
 U danielk1977
-Z 2a85eb76c461ae700bdd874fef6ec61c
+Z 6407fceff92b93d3f593e2127f236877

diff --git a/manifest.uuid b/manifest.uuid
index 66b878cc24525d8a22757ee584e5372c9a63bc7a..ba0fa3f6347de40684342979cd867c91e115d8b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0b022e5b2bfd272b4e25cd7a7b472206a118bbe
\ No newline at end of file
+4de5c52920c94e2a29ef4b68eb8b990c63005b3d
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 36cf5dc8da3fe1650df362eb224d081bb9db90c1..1670d1966d75d491257386f400e1a7ae945e0aca 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.174 2006/01/18 15:25:18 danielk1977 Exp $
+** $Id: util.c,v 1.175 2006/01/18 15:39:26 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -647,9 +647,11 @@ void sqlite3ReallocOrFree(void **pp, int n){
 ** is the number of bytes that were available to SQLite using pointer p, 
 ** regardless of how much memory was actually allocated.
 */
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
 int sqlite3AllocSize(void *p){
   return OSSIZEOF(p);
 }
+#endif
 
 /*
 ** Make a copy of a string in memory obtained from sqliteMalloc(). These