Module: kamailio Branch: master Commit: 549c24f0b11d84dfa7c9cc829ced2298dd871bd2 URL: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced2298...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2015-09-14T10:22:46+02:00

core: defines printed in version string adjusted for new memory manager

---

Modified: ver_defs.h

---

Diff: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced2298... Patch: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced2298...

---

diff --git a/ver_defs.h b/ver_defs.h index a0717ae..0ea87b9 100644 --- a/ver_defs.h +++ b/ver_defs.h @@ -135,6 +135,12 @@ #define F_MALLOC_STR "" #endif

+#ifdef Q_MALLOC +#define Q_MALLOC_STR ", Q_MALLOC" +#else +#define Q_MALLOC_STR "" +#endif + #ifdef DL_MALLOC #define DL_MALLOC_STR ", DL_MALLOC" #else @@ -165,6 +171,12 @@ #define USE_SHM_MEM_STR "" #endif

+#ifdef DBG_SR_MEMORY +#define DBG_SR_MEMORY_STR ", DBG_SR_MEMORY" +#else +#define DBG_SR_MEMORY_STR "" +#endif + #ifdef DBG_QM_MALLOC #define DBG_QM_MALLOC_STR ", DBG_QM_MALLOC" #else @@ -177,12 +189,6 @@ #define DBG_F_MALLOC_STR "" #endif

-#ifdef DEBUG_DMALLOC -#define DEBUG_DMALLOC_STR ", DEBUG_DMALLOC" -#else -#define DEBUG_DMALLOC_STR "" -#endif - #ifdef DBG_SF_MALLOC #define DBG_SF_MALLOC_STR ", DBG_SF_MALLOC" #else @@ -332,15 +338,14 @@

#define SER_COMPILE_FLAGS \ STATS_STR EXTRA_DEBUG_STR USE_TCP_STR USE_TLS_STR \ - USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ + USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \ - NO_SIG_DEBUG_STR DNS_IP_HACK_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ - F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ - USE_SHM_MEM_STR \ - DBG_QM_MALLOC_STR \ - DBG_F_MALLOC_STR DEBUG_DMALLOC_STR DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \ - TIMER_DEBUG_STR \ - USE_FUTEX_STR \ + NO_SIG_DEBUG_STR DNS_IP_HACK_STR \ + USE_SHM_MEM_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ + Q_MALLOC_STR F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ + DBG_SR_MEMORY_STR DBG_QM_MALLOC_STR DBG_F_MALLOC_STR \ + DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \ + TIMER_DEBUG_STR USE_FUTEX_STR \ FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \ USE_SYSV_SEM_STR USE_COMP_STR USE_DNS_CACHE_STR USE_DNS_FAILOVER_STR \ DNS_WATCHDOG_SUPPORT_STR USE_NAPTR_STR USE_DST_BLACKLIST_STR \