update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6904 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
80da2e371b
commit
2faabff764
|
@ -239,7 +239,7 @@ libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/liba
|
||||||
@$(TOUCH_TARGET)
|
@$(TOUCH_TARGET)
|
||||||
|
|
||||||
libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
|
libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
|
||||||
@cd libs/sqlite && $(MAKE)
|
@cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)"
|
||||||
@$(TOUCH_TARGET)
|
@$(TOUCH_TARGET)
|
||||||
|
|
||||||
libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
|
libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
|
||||||
|
|
23
configure.in
23
configure.in
|
@ -60,14 +60,6 @@ if test "${enable_optimizer}" = "yes" ; then
|
||||||
AX_CC_MAXOPT
|
AX_CC_MAXOPT
|
||||||
fi
|
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"])
|
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
|
||||||
|
|
||||||
|
@ -147,6 +139,21 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
|
||||||
APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
|
APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
|
||||||
fi
|
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
|
# tweak platform specific flags
|
||||||
case "$host" in
|
case "$host" in
|
||||||
*darwin*)
|
*darwin*)
|
||||||
|
|
|
@ -269,9 +269,18 @@ extern int sqlite3_iLine; /* Line number for debug info */
|
||||||
|
|
||||||
#else
|
#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 ENTER_MALLOC 0
|
||||||
#define sqliteMalloc(x) sqlite3Malloc(x,1)
|
#define sqliteMalloc(x) zmalloc(x)//sqlite3Malloc(x,1)
|
||||||
#define sqliteMallocRaw(x) sqlite3MallocRaw(x,1)
|
#define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1)
|
||||||
#define sqliteRealloc(x,y) sqlite3Realloc(x,y)
|
#define sqliteRealloc(x,y) sqlite3Realloc(x,y)
|
||||||
#define sqliteStrDup(x) sqlite3StrDup(x)
|
#define sqliteStrDup(x) sqlite3StrDup(x)
|
||||||
#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y)
|
#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y)
|
||||||
|
|
Loading…
Reference in New Issue