Fix compilation errors when building SQLITE_DEBUG defined but without SQLITE_MEMDEBUG...

FossilOrigin-Name: 62dd2427784721436737a6e8e11fc05e10f0c44d

diff --git a/manifest b/manifest
index 1287d1401333ab28d6487591ec170aaa3723c911..7c416998df1e6035d0f8e27b56edb6e9dc17f783 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Various\sfixes\sthat\sallow\sthe\smalloc()\sfailure\stests\sto\spass\sagain.\s(CVS\s2963)
-D 2006-01-17T13:21:40
+C Fix\scompilation\serrors\swhen\sbuilding\sSQLITE_DEBUG\sdefined\sbut\swithout\sSQLITE_MEMDEBUG.\s(CVS\s2964)
+D 2006-01-17T15:36:32
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -70,7 +70,7 @@ F src/select.c 28d449c7762dd580aaba49a9c6c16e93ca951e49
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 66b073375efbdee19045e7e0cd38b85f9aff71da
 F src/sqlite.h.in 492580f7e3ff71eb43193eb7bb98e2d549889ce3
-F src/sqliteInt.h 0d0c3b40827557597ba388b1ef782e28ea623d30
+F src/sqliteInt.h e6c2e3afa7a1eab72dcaf30ad1f3410db9ddd3e4
 F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316
 F src/tclsqlite.c d650bea0248fc0a310ddc2cb94273a3a5021fddf
 F src/test1.c 4dccd51f786f24d8f947f1028d840ab35f46d4de
@@ -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 60adb2a04e3267f916eba5452bef8688308cad1b
+F src/util.c 25e867296bce168095c87460ab5eec150015cb7d
 F src/vacuum.c 21a3c7f6f7be86bb1182fbc3df416ad702435b9e
 F src/vdbe.c 3db9bfc86e71dc0758524fb82cfcfd4c30e92716
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
@@ -96,7 +96,7 @@ F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c dd08a0eea4868ac4a2d91fdec32424308b1db772
 F src/where.c 9fd58a8f5525d036a088c92bb14e2885c2243bc8
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
-F test/all.test a23fcbbf1f53515bde840d78732a6d94c673b327
+F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
 F test/alter.test d2569ed639946be29cfcae9117942b4a6d01f719
 F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
@@ -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 3a54a33dcb7e765ee3773397407e8929a8cfe1a9
-R 675b739278e2c68c1d8f47ad7192ced7
+P 0505405fb9ae1068b7976718efbf2aabd07592d4
+R cb03a308542c42e76784fb6f3e9d9763
 U danielk1977
-Z 76c8e3304de47e86266e4fd438942871
+Z eeefbc2d36846c9ebcbcff8403adbd5b

diff --git a/manifest.uuid b/manifest.uuid
index a90093758e6176cd01224cf2fe882dbe2ca4f5b0..13c686985619192711a97bd3d2806193bf405a07 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0505405fb9ae1068b7976718efbf2aabd07592d4
\ No newline at end of file
+62dd2427784721436737a6e8e11fc05e10f0c44d
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a338f7e4936249a7154b7a967beada635c30fdb4..8865f4eb96b285954a465a6b68e327db68ef9b75 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.470 2006/01/17 13:21:40 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.471 2006/01/17 15:36:32 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1757,12 +1757,12 @@ int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *,
 #endif
 
 void sqlite3MallocClearFailed();
-#ifdef NDEBUG
-  #define sqlite3MallocDisallow()
-  #define sqlite3MallocAllow()
-#else
+#ifdef SQLITE_MEMDEBUG
   void sqlite3MallocDisallow();
   void sqlite3MallocAllow();
+#else
+  #define sqlite3MallocDisallow()
+  #define sqlite3MallocAllow()
 #endif
 
 #ifdef SQLITE_SSE

diff --git a/src/util.c b/src/util.c
index da719bd2bd5c7fda07854b1d142f839911ebce59..ab7e1420c9d410a864ac79dc37fd2d8527047a46 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.172 2006/01/16 15:32:23 danielk1977 Exp $
+** $Id: util.c,v 1.173 2006/01/17 15:36:32 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1347,7 +1347,7 @@ void sqlite3MallocClearFailed(){
   }
 }
 
-#ifndef NDEBUG
+#ifdef SQLITE_MEMDEBUG
 /*
 ** This function sets a flag in the thread-specific-data structure that will
 ** cause an assert to fail if sqliteMalloc() or sqliteRealloc() is called.

diff --git a/test/all.test b/test/all.test
index 1d295ffa97e1f60325137d8465ac9623276816dd..6f8b7048310e976056217364e5d86228c0a16042 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.34 2006/01/11 01:08:34 drh Exp $
+# $Id: all.test,v 1.35 2006/01/17 15:36:33 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -133,7 +133,7 @@ if {$::tcl_platform(platform)=="unix"} {
 #
 catch {source $testdir/misuse.test}
 set sqlite_open_file_count 0
-# catch {source $testdir/malloc.test}
+catch {source $testdir/malloc.test}
 
 catch {db close}
 set sqlite_open_file_count 0