diff --git a/libs/sqlite/.update b/libs/sqlite/.update index 60fffd18f9..55bdca0f6c 100644 --- a/libs/sqlite/.update +++ b/libs/sqlite/.update @@ -1 +1 @@ -date +Fri Jan 4 10:43:39 CST 2008 diff --git a/libs/sqlite/src/sqliteInt.h b/libs/sqlite/src/sqliteInt.h index de5be8e583..26d83f4eea 100644 --- a/libs/sqlite/src/sqliteInt.h +++ b/libs/sqlite/src/sqliteInt.h @@ -15,7 +15,7 @@ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ - +#define _GNU_SOURCE /* ** Extra interface definitions for those who need them */ @@ -285,14 +285,22 @@ static inline void *zmalloc(size_t x) #define ENTER_MALLOC 0 #define sqliteMalloc(x) zmalloc(x)//sqlite3Malloc(x,1) #define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1) -#define sqliteRealloc(x,y) sqlite3Realloc(x,y) -#define sqliteStrDup(x) sqlite3StrDup(x) -#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y) +#define sqliteRealloc(x,y) realloc(x, y)//sqlite3Realloc(x,y) +#define sqliteStrDup(x) strdup(x)//sqlite3StrDup(x) +#define sqliteStrNDup(x,y) strndup(x, y)//sqlite3StrNDup(x,y) #define sqliteReallocOrFree(x,y) sqlite3ReallocOrFree(x,y) #endif -#define sqliteFree(x) sqlite3FreeX(x) +static inline void sane_free(void *x) +{ + if (x) { + free(x); + x = NULL; + } +} + +#define sqliteFree(x) sane_free(x) //sqlite3FreeX(x) #define sqliteAllocSize(x) sqlite3AllocSize(x)