Browse code

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

Daniel-Constantin Mierla authored on 14/09/2015 07:32:38
Showing 1 changed files
... ...
@@ -135,6 +135,12 @@
135 135
 #define F_MALLOC_STR ""
136 136
 #endif
137 137
 
138
+#ifdef Q_MALLOC
139
+#define Q_MALLOC_STR ", Q_MALLOC"
140
+#else
141
+#define Q_MALLOC_STR ""
142
+#endif
143
+
138 144
 #ifdef DL_MALLOC
139 145
 #define DL_MALLOC_STR ", DL_MALLOC"
140 146
 #else
... ...
@@ -165,6 +171,12 @@
165 171
 #define USE_SHM_MEM_STR ""
166 172
 #endif
167 173
 
174
+#ifdef DBG_SR_MEMORY
175
+#define DBG_SR_MEMORY_STR ", DBG_SR_MEMORY"
176
+#else
177
+#define DBG_SR_MEMORY_STR ""
178
+#endif
179
+
168 180
 #ifdef DBG_QM_MALLOC
169 181
 #define DBG_QM_MALLOC_STR ", DBG_QM_MALLOC"
170 182
 #else
... ...
@@ -177,12 +189,6 @@
177 189
 #define DBG_F_MALLOC_STR ""
178 190
 #endif
179 191
 
180
-#ifdef DEBUG_DMALLOC
181
-#define DEBUG_DMALLOC_STR ", DEBUG_DMALLOC"
182
-#else
183
-#define DEBUG_DMALLOC_STR ""
184
-#endif
185
-
186 192
 #ifdef DBG_SF_MALLOC
187 193
 #define DBG_SF_MALLOC_STR ", DBG_SF_MALLOC"
188 194
 #else
... ...
@@ -332,15 +338,14 @@
332 338
 
333 339
 #define SER_COMPILE_FLAGS \
334 340
 	STATS_STR EXTRA_DEBUG_STR USE_TCP_STR USE_TLS_STR \
335
-	USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR  USE_RAW_SOCKS_STR \
341
+	USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \
336 342
 	DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \
337
-	NO_SIG_DEBUG_STR DNS_IP_HACK_STR  SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \
338
-	F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR  LL_MALLOC_STR TLSF_MALLOC_STR \
339
-	USE_SHM_MEM_STR \
340
-	DBG_QM_MALLOC_STR \
341
-	DBG_F_MALLOC_STR DEBUG_DMALLOC_STR DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \
342
-	TIMER_DEBUG_STR \
343
-	USE_FUTEX_STR \
343
+	NO_SIG_DEBUG_STR DNS_IP_HACK_STR \
344
+	USE_SHM_MEM_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \
345
+	Q_MALLOC_STR F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \
346
+	DBG_SR_MEMORY_STR DBG_QM_MALLOC_STR DBG_F_MALLOC_STR \
347
+	DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \
348
+	TIMER_DEBUG_STR USE_FUTEX_STR \
344 349
 	FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \
345 350
 	USE_SYSV_SEM_STR USE_COMP_STR USE_DNS_CACHE_STR USE_DNS_FAILOVER_STR \
346 351
 	DNS_WATCHDOG_SUPPORT_STR USE_NAPTR_STR USE_DST_BLACKLIST_STR \