Merge "res_pjsip: Make pjlib.h consistently included." into 13

include/asterisk/res_pjsip.h

@@ -24,6 +24,7 @@
 #include <pjsip_simple.h>
 #include <pjsip/sip_transaction.h>
 #include <pj/timer.h>
+/* Needed for pj_sockaddr */
 #include <pjlib.h>
 
 #include "asterisk/stringfields.h"
@@ -41,8 +42,6 @@
 #include "asterisk/endpoints.h"
 /* Needed for ast_t38_ec_modes */
 #include "asterisk/udptl.h"
-/* Needed for pj_sockaddr */
-#include <pjlib.h>
 /* Needed for ast_rtp_dtls_cfg struct */
 #include "asterisk/rtp_engine.h"
 /* Needed for AST_VECTOR macro */

include/asterisk/res_pjsip_session.h

@@ -20,7 +20,7 @@
 #define _RES_PJSIP_SESSION_H
 
 /* Needed for pj_timer_entry definition */
-#include "pjlib.h"
+#include <pjlib.h>
 #include "asterisk/linkedlists.h"
 /* Needed for AST_MAX_EXTENSION constant */
 #include "asterisk/channel.h"

res/res_pjsip/config_domain_aliases.c

@@ -18,8 +18,9 @@
 
 #include "asterisk.h"
 
-#include "pjsip.h"
+#include <pjsip.h>
-#include "pjlib.h"
+#include <pjlib.h>
+
 #include "asterisk/res_pjsip.h"
 #include "include/res_pjsip_private.h"
 #include "asterisk/logger.h"

res/res_pjsip/pjsip_outbound_auth.c

@@ -17,9 +17,10 @@
  */
 
 #include "asterisk.h"
+
 #undef bzero
 #define bzero bzero
-#include "pjsip.h"
+#include <pjsip.h>
 
 #include "asterisk/res_pjsip.h"
 #include "asterisk/module.h"