<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6886">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Bundled pjproject: Enable pj_assert when dev-mode is enabled.<br><br>ASTERISK-27359<br><br>Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517<br>---<br>M third-party/pjproject/Makefile<br>M third-party/pjproject/patches/config_site.h<br>2 files changed, 6 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile<br>index 7a42edc..9d5a9cb 100644<br>--- a/third-party/pjproject/Makefile<br>+++ b/third-party/pjproject/Makefile<br>@@ -61,6 +61,9 @@<br> TARGETS += source/pjsip-apps/src/python/_pjsua.so<br> endif<br> endif<br>+ ifeq ($(AST_DEVMODE),yes)<br>+ CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes<br>+ endif<br> ifeq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),MALLOC_DEBUG)<br> CF += -DMALLOC_DEBUG<br> MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a<br>diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h<br>index 561b3a2..a11bc06 100644<br>--- a/third-party/pjproject/patches/config_site.h<br>+++ b/third-party/pjproject/patches/config_site.h<br>@@ -27,7 +27,10 @@<br> #define PJMEDIA_HAS_WEBRTC_AEC 0<br> <br> #define PJ_HAS_IPV6 1<br>+#if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)<br> #define NDEBUG 1<br>+#endif<br>+<br> #define PJ_MAX_HOSTNAME (256)<br> #define PJSIP_MAX_URL_SIZE (512)<br> #ifdef PJ_HAS_LINUX_EPOLL<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6886">change 6886</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6886"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517 </div>
<div style="display:none"> Gerrit-Change-Number: 6886 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>