[sr-dev] git:master:50df0fee: mem: old pkg management disabled

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 50df0feecc34e9f0ec025482406688e1d4e19252
URL: https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e1d4e19252

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-09-14T10:22:45+02:00

mem: old pkg management disabled

---

Modified: mem/mem.c
Modified: mem/mem.h

---

Diff:  https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e1d4e19252.diff
Patch: https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e1d4e19252.patch

---

diff --git a/mem/mem.c b/mem/mem.c
index 18fb9af..30ba766 100644
--- a/mem/mem.c
+++ b/mem/mem.c
@@ -42,6 +42,8 @@
 #include "shm_mem.h"
 #endif
 
+#if 0
+
 #ifdef PKG_MALLOC
 	#ifndef DL_MALLOC
 	char* mem_pool = 0;
@@ -130,3 +132,4 @@ int init_shm_mallocs(int force_alloc)
 #endif
 	return 0;
 }
+#endif 
diff --git a/mem/mem.h b/mem/mem.h
index 432f29a..59d23d1 100644
--- a/mem/mem.h
+++ b/mem/mem.h
@@ -40,6 +40,9 @@
 #include "../config.h"
 #include "../dprint.h"
 
+#include "pkg.h"
+
+#if 0
 /* fix debug defines, DBG_F_MALLOC <=> DBG_QM_MALLOC */
 #ifdef F_MALLOC
 	#ifdef DBG_F_MALLOC
@@ -187,6 +190,7 @@ void destroy_pkg_mallocs(void);
  * \return 0 if the memory allocation was successful, -1 otherwise
  */
 int init_shm_mallocs(int force_alloc);
+#endif
 
 /** generic logging helper for allocation errors in private memory pool/ system */
 #ifdef SYSTEM_MALLOC