mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-14 00:24:05 +00:00
Merge "res_pjsip: Make pjlib.h consistently included."
This commit is contained in:
@@ -24,6 +24,7 @@
|
|||||||
#include <pjsip_simple.h>
|
#include <pjsip_simple.h>
|
||||||
#include <pjsip/sip_transaction.h>
|
#include <pjsip/sip_transaction.h>
|
||||||
#include <pj/timer.h>
|
#include <pj/timer.h>
|
||||||
|
/* Needed for pj_sockaddr */
|
||||||
#include <pjlib.h>
|
#include <pjlib.h>
|
||||||
|
|
||||||
#include "asterisk/stringfields.h"
|
#include "asterisk/stringfields.h"
|
||||||
@@ -41,8 +42,6 @@
|
|||||||
#include "asterisk/endpoints.h"
|
#include "asterisk/endpoints.h"
|
||||||
/* Needed for ast_t38_ec_modes */
|
/* Needed for ast_t38_ec_modes */
|
||||||
#include "asterisk/udptl.h"
|
#include "asterisk/udptl.h"
|
||||||
/* Needed for pj_sockaddr */
|
|
||||||
#include <pjlib.h>
|
|
||||||
/* Needed for ast_rtp_dtls_cfg struct */
|
/* Needed for ast_rtp_dtls_cfg struct */
|
||||||
#include "asterisk/rtp_engine.h"
|
#include "asterisk/rtp_engine.h"
|
||||||
/* Needed for AST_VECTOR macro */
|
/* Needed for AST_VECTOR macro */
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
#define _RES_PJSIP_SESSION_H
|
#define _RES_PJSIP_SESSION_H
|
||||||
|
|
||||||
/* Needed for pj_timer_entry definition */
|
/* Needed for pj_timer_entry definition */
|
||||||
#include "pjlib.h"
|
#include <pjlib.h>
|
||||||
#include "asterisk/linkedlists.h"
|
#include "asterisk/linkedlists.h"
|
||||||
/* Needed for AST_MAX_EXTENSION constant */
|
/* Needed for AST_MAX_EXTENSION constant */
|
||||||
#include "asterisk/channel.h"
|
#include "asterisk/channel.h"
|
||||||
|
@@ -18,8 +18,9 @@
|
|||||||
|
|
||||||
#include "asterisk.h"
|
#include "asterisk.h"
|
||||||
|
|
||||||
#include "pjsip.h"
|
#include <pjsip.h>
|
||||||
#include "pjlib.h"
|
#include <pjlib.h>
|
||||||
|
|
||||||
#include "asterisk/res_pjsip.h"
|
#include "asterisk/res_pjsip.h"
|
||||||
#include "include/res_pjsip_private.h"
|
#include "include/res_pjsip_private.h"
|
||||||
#include "asterisk/logger.h"
|
#include "asterisk/logger.h"
|
||||||
|
Reference in New Issue
Block a user