[sr-dev] git:master:33c6aafc: Makefile.defs: re-enable mem join define

Module: kamailio Branch: master Commit: 33c6aafcd46269ce283908f49fbf70b9d73624b1 URL: https://github.com/kamailio/kamailio/commit/33c6aafcd46269ce283908f49fbf70b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-08T15:11:45+02:00 Makefile.defs: re-enable mem join define - lost when introduced the option to select the memory manager by command line parameter -x --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/33c6aafcd46269ce283908f49fbf70b… Patch: https://github.com/kamailio/kamailio/commit/33c6aafcd46269ce283908f49fbf70b… --- diff --git a/Makefile.defs b/Makefile.defs index 3f3d830..7afc889 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -664,6 +664,7 @@ C_DEFS= $(extra_defs) \ # debugging symbols in all cases (-g). --andrei # memory managers and related debug mode +C_DEFS+= -DMEM_JOIN_FREE # enable f_malloc C_DEFS+= -DF_MALLOC # enable q_malloc