<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9817">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Make pjlib.h consistently included.<br><br>* Don't include pjlib.h twice in res_pjsip.h<br>* Consistently use #include <> form for pjproject includes.<br>(pjsip.h and pjlib.h)<br><br>Change-Id: I3f7b42044840de64edf7e9d7695cb60c45990dc7<br>---<br>M include/asterisk/res_pjsip.h<br>M include/asterisk/res_pjsip_session.h<br>M res/res_pjsip/config_domain_aliases.c<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h</span><br><span>index 849f087..cb4fdd7 100644</span><br><span>--- a/include/asterisk/res_pjsip.h</span><br><span>+++ b/include/asterisk/res_pjsip.h</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <pjsip_simple.h></span><br><span> #include <pjsip/sip_transaction.h></span><br><span> #include <pj/timer.h></span><br><span style="color: hsl(120, 100%, 40%);">+/* Needed for pj_sockaddr */</span><br><span> #include <pjlib.h></span><br><span> </span><br><span> #include "asterisk/stringfields.h"</span><br><span>@@ -41,8 +42,6 @@</span><br><span> #include "asterisk/endpoints.h"</span><br><span> /* Needed for ast_t38_ec_modes */</span><br><span> #include "asterisk/udptl.h"</span><br><span style="color: hsl(0, 100%, 40%);">-/* Needed for pj_sockaddr */</span><br><span style="color: hsl(0, 100%, 40%);">-#include <pjlib.h></span><br><span> /* Needed for ast_rtp_dtls_cfg struct */</span><br><span> #include "asterisk/rtp_engine.h"</span><br><span> /* Needed for AST_VECTOR macro */</span><br><span>diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h</span><br><span>index 6c8cda6..ccee8c9 100644</span><br><span>--- a/include/asterisk/res_pjsip_session.h</span><br><span>+++ b/include/asterisk/res_pjsip_session.h</span><br><span>@@ -20,7 +20,7 @@</span><br><span> #define _RES_PJSIP_SESSION_H</span><br><span> </span><br><span> /* Needed for pj_timer_entry definition */</span><br><span style="color: hsl(0, 100%, 40%);">-#include "pjlib.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <pjlib.h></span><br><span> #include "asterisk/linkedlists.h"</span><br><span> /* Needed for AST_MAX_EXTENSION constant */</span><br><span> #include "asterisk/channel.h"</span><br><span>diff --git a/res/res_pjsip/config_domain_aliases.c b/res/res_pjsip/config_domain_aliases.c</span><br><span>index 79ea8dd..313e703 100644</span><br><span>--- a/res/res_pjsip/config_domain_aliases.c</span><br><span>+++ b/res/res_pjsip/config_domain_aliases.c</span><br><span>@@ -18,8 +18,9 @@</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "pjsip.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "pjlib.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <pjsip.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pjlib.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "asterisk/res_pjsip.h"</span><br><span> #include "include/res_pjsip_private.h"</span><br><span> #include "asterisk/logger.h"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9817">change 9817</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9817"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3f7b42044840de64edf7e9d7695cb60c45990dc7 </div>
<div style="display:none"> Gerrit-Change-Number: 9817 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>