[sr-dev] git:4.4:b21b9cd9: Makefile.defs: re-enable mem join define

Module: kamailio Branch: 4.4 Commit: b21b9cd9cb6a08b9bfc9d025b4e6a64a12e50d65 URL: https://github.com/kamailio/kamailio/commit/b21b9cd9cb6a08b9bfc9d025b4e6a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-08T15:12:12+02:00 Makefile.defs: re-enable mem join define - lost when introduced the option to select the memory manager by command line parameter -x (cherry picked from commit 33c6aafcd46269ce283908f49fbf70b9d73624b1) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b21b9cd9cb6a08b9bfc9d025b4e6a64… Patch: https://github.com/kamailio/kamailio/commit/b21b9cd9cb6a08b9bfc9d025b4e6a64… --- diff --git a/Makefile.defs b/Makefile.defs index 26205e8..245f9b4 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