mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
pjproject: Upgrade bundled version to pjproject 2.10
This patch makes the usual necessary changes when upgrading to a new version pjproject. For instance, version number bump, patches removed from third-party, new *.md5 file added, etc.. This patch also includes a change to the Asterisk pjproject Makefile to explicitly create the 'source/pjsip-apps/lib' directory. This directory is no longer there by default so needs to be added so the Asterisk malloc debug can be built. This patch also includes some minor changes to Asterisk that were a result of the upgrade. Specifically, there was a backward incompatibility change made in 2.10 that modified the "expires header" variable field from a signed to an unsigned value. This potentially effects comparison. Namely, those check for a value less than zero. This patch modified a few locations in the Asterisk code that may have been affected. Lastly, this patch adds a new macro PJSIP_MINVERSION that can be used to check a minimum version of pjproject at compile time. ASTERISK-28899 #close Change-Id: Iec8821c6cbbc08c369d0e3cd2f14e691b41d0c81
This commit is contained in:
committed by
Friendly Automation
parent
de2813cf23
commit
415b55af5a
@@ -50,6 +50,18 @@
|
||||
#include "asterisk/stasis_channels.h"
|
||||
#include "asterisk/stasis_endpoints.h"
|
||||
|
||||
#define PJSIP_MINVERSION(m,n,p) (((m << 24) | (n << 16) | (p << 8)) >= PJ_VERSION_NUM)
|
||||
|
||||
#ifndef PJSIP_EXPIRES_NOT_SPECIFIED
|
||||
/*
|
||||
* Added in pjproject 2.10.0. However define here if someone compiles against a
|
||||
* version of pjproject < 2.10.0.
|
||||
*
|
||||
* Usually defined in pjsip/include/pjsip/sip_msg.h (included as part of <pjsip.h>)
|
||||
*/
|
||||
#define PJSIP_EXPIRES_NOT_SPECIFIED ((pj_uint32_t)-1)
|
||||
#endif
|
||||
|
||||
/* Forward declarations of PJSIP stuff */
|
||||
struct pjsip_rx_data;
|
||||
struct pjsip_module;
|
||||
|
Reference in New Issue
Block a user