diff options
| author | George Joseph <gjoseph@digium.com> | 2016-10-05 13:53:10 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-10-09 18:15:12 -0500 |
| commit | c5e8f5016913102833147c7ac2d09001358abacf (patch) | |
| tree | f0701777d8f22aa40bcc077d10959e32e1da7c57 /third-party/pjproject/patches/config_site.h | |
| parent | 55e8c9eff24b5d6f22cbb0f9a9aa165e63f3d538 (diff) | |
pjproject_bundled: Add MALLOC_DEBUG capability
pjproject_bundled will now use the asterisk memory debugging APIs
if MALLOC_DEBUG is turned on in menuselect.
Because this required stubs for the executable programs and the python
bindings, some Makefile reorganization was needed to properly handle
the dependencies. As a result, the makefile now individually makes
each of the pjproject libraries separately instead of making them all
in 1 shot. The only visible change is that there are separate status
lines printed for each library instead oif 1 for all libs. Also, the
making of the pjproject dependency files was eliminated. They're not
needed for building unless you're actively modifying pjproject source
files and it makes the build process faster. Finally, any issues with
parallel builds should be resolved again making the build faster.
Change-Id: Icc5e3d658fbfb00e0a46b44c66dcc2522d5171b0
Diffstat (limited to 'third-party/pjproject/patches/config_site.h')
| -rw-r--r-- | third-party/pjproject/patches/config_site.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index f9f76dc6c..0694f120e 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -5,6 +5,14 @@ #include <sys/select.h> /* + * Since both pjproject and asterisk source files will include config_site.h, + * we need to make sure that only pjproject source files include asterisk_malloc_debug.h. + */ +#if defined(MALLOC_DEBUG) && !defined(_ASTERISK_ASTMM_H) +#include "asterisk_malloc_debug.h" +#endif + +/* * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use srtp. * It only disables the pjmedia srtp transport which Asterisk doesn't use. * The reason for the disable is that while Asterisk works fine with older libsrtp |