<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">IPA_Emulation: Fix building without CTRL support<br><br>Back in JUne, Change-Id I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7<br>attempted to introduce compilation of IPA_Emulation without CTRL but<br>it failed to cover all references to CTRL with the correspondign<br>ifdef/endif blocks.  Let's fix this.<br><br>Change-Id: I68349b32f613aacced84011601121f2265243600<br>---<br>M library/IPA_Emulation.ttcnpp<br>1 file changed, 9 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 2305b7b..7b80c2d 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -51,8 +51,9 @@</span><br><span> import from RSPRO_Types all;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span> import from Osmocom_CTRL_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> modulepar {</span><br><span>   /* Use Osmocom extended IPA mux header */</span><br><span>@@ -146,10 +147,12 @@</span><br><span> } with { extension "internal" }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span> /* Client port for CTRL inside IPA */</span><br><span> type port IPA_CTRL_PT message {</span><br><span>  inout CtrlMessage, ASP_IPA_Event;</span><br><span> } with { extension "internal" }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span> /* Client port for CTRL inside IPA */</span><br><span>@@ -550,8 +553,10 @@</span><br><span>      var ASP_Event asp_evt;</span><br><span>       var Socket_API_Definitions.PortEvent port_evt;</span><br><span>       var octetstring payload;</span><br><span style="color: hsl(0, 100%, 40%);">-        var CtrlMessage ctrl_msg;</span><br><span>    var ASP_IPA_Unitdata ipa_ud;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+       var CtrlMessage ctrl_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #ifdef IPA_EMULATION_SCCP</span><br><span>       var ASP_MTP3_TRANSFERreq mtp_req;</span><br><span> #endif</span><br><span>@@ -631,9 +636,11 @@</span><br><span>                                           f_mgcp_to_user(ipa_rx.msg);</span><br><span>                                  }</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span>                                       case (IPAC_PROTO_EXT_CTRL) {</span><br><span>                                                 f_ctrl_to_user(ipa_rx.msg);</span><br><span>                                  }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span>                                       case (IPAC_PROTO_EXT_GSUP) {</span><br><span>                                                 f_gsup_to_user(ipa_rx.msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230">change 15230</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/osmo-ttcn3-hacks/+/15230"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I68349b32f613aacced84011601121f2265243600 </div>
<div style="display:none"> Gerrit-Change-Number: 15230 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>