diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-25 09:03:19 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-25 09:03:19 -0500 |
| commit | 65357091d868f2652432506b0b6ff81ef273a8a2 (patch) | |
| tree | 573af2186e49659cb422372acbe4a1207a3107ea /third-party/pjproject | |
| parent | 0436fe18f075a8b23663c14fa1faf20df43ea36c (diff) | |
| parent | fb585cf185235bf653e71e690a23532271a4dda8 (diff) | |
Merge "Bundled pjproject: Enable pj_assert when dev-mode is enabled."
Diffstat (limited to 'third-party/pjproject')
| -rw-r--r-- | third-party/pjproject/Makefile | 3 | ||||
| -rw-r--r-- | third-party/pjproject/patches/config_site.h | 3 |
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 |