diff options
| author | danielk1977 <danielk1977@noemail.net> | 2006-01-17 15:36:32 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2006-01-17 15:36:32 +0000 |
| commit | 08659fee65062a45324c627ec122cf4b7c70d0b9 (patch) | |
| tree | 8ca3b3b5a51b9382371ebb8b641d72e4dc5cd49e /src | |
| parent | 771151b67f3437309d784f7342364ed8c7d6fd15 (diff) | |
| download | sqlite-08659fee65062a45324c627ec122cf4b7c70d0b9.tar.gz sqlite-08659fee65062a45324c627ec122cf4b7c70d0b9.zip | |
Fix compilation errors when building SQLITE_DEBUG defined but without SQLITE_MEMDEBUG. (CVS 2964)
FossilOrigin-Name: 62dd2427784721436737a6e8e11fc05e10f0c44d
Diffstat (limited to 'src')
| -rw-r--r-- | src/sqliteInt.h | 10 | ||||
| -rw-r--r-- | src/util.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index a338f7e49..8865f4eb9 100644 --- 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 da719bd2b..ab7e1420c 100644 --- 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. |