summaryrefslogtreecommitdiff
path: root/third-party
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-10-23 02:02:22 -0400
committerCorey Farrell <git@cfware.com>2017-10-23 15:17:58 -0400
commitfb585cf185235bf653e71e690a23532271a4dda8 (patch)
tree0ebc071ce395ee3bd39a7eba27f80bdafa9bc3b9 /third-party
parent8b719a3e48a7dd95a9f5e80a2bcdde822f26bdb4 (diff)
Bundled pjproject: Enable pj_assert when dev-mode is enabled.
ASTERISK-27359 Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517
Diffstat (limited to 'third-party')
-rw-r--r--third-party/pjproject/Makefile3
-rw-r--r--third-party/pjproject/patches/config_site.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 7a42edcde..9d5a9cb1c 100644
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -61,6 +61,9 @@ ifeq ($(SPECIAL_TARGETS),)
TARGETS += source/pjsip-apps/src/python/_pjsua.so
endif
endif
+ ifeq ($(AST_DEVMODE),yes)
+ CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes
+ endif
ifeq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),MALLOC_DEBUG)
CF += -DMALLOC_DEBUG
MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h
index 561b3a231..a11bc0640 100644
--- a/third-party/pjproject/patches/config_site.h
+++ b/third-party/pjproject/patches/config_site.h
@@ -27,7 +27,10 @@
#define PJMEDIA_HAS_WEBRTC_AEC 0
#define PJ_HAS_IPV6 1
+#if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
#define NDEBUG 1
+#endif
+
#define PJ_MAX_HOSTNAME (256)
#define PJSIP_MAX_URL_SIZE (512)
#ifdef PJ_HAS_LINUX_EPOLL