Author: anthm Date: Wed Dec 19 16:13:09 2007 New Revision: 6904 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in freeswitch/trunk/libs/sqlite/src/sqliteInt.h Log: update Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Dec 19 16:13:09 2007 @@ -239,7 +239,7 @@ @$(TOUCH_TARGET) libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update - @cd libs/sqlite && $(MAKE) + @cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)" @$(TOUCH_TARGET) libs/pcre/libpcre.la: libs/pcre libs/pcre/.update Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed Dec 19 16:13:09 2007 @@ -60,14 +60,6 @@ AX_CC_MAXOPT fi -# Enable debugging -AC_ARG_ENABLE(debug, -[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"]) - -if test "${enable_debug}" = "yes"; then - AC_DEFINE([DEBUG],[],[Enable extra debugging.]) - AX_CFLAGS_WARN_ALL_ANSI -fi AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) @@ -147,6 +139,21 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) fi +# Enable debugging +AC_ARG_ENABLE(debug, +[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"]) + +if test "${enable_debug}" = "yes"; then + AC_DEFINE([DEBUG],[],[Enable extra debugging.]) + AX_CFLAGS_WARN_ALL_ANSI + + if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + APR_ADDTO(SWITCH_AM_CFLAGS, -g -ggdb) + fi + +fi + + # tweak platform specific flags case "$host" in *darwin*) Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/sqliteInt.h (original) +++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h Wed Dec 19 16:13:09 2007 @@ -269,9 +269,18 @@ #else +static inline void *zmalloc(size_t x) +{ + void *z = malloc(x); + assert(z); + memset(z, 0, x); + return z; +} + + #define ENTER_MALLOC 0 -#define sqliteMalloc(x) sqlite3Malloc(x,1) -#define sqliteMallocRaw(x) sqlite3MallocRaw(x,1) +#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)