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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">core: Remove dead symbols from asterisk.exports.in.<br><br>* dahdi_chan_name<br>* dahdi_chan_name_len<br>* dahdi_chan_mode<br>* __manager_event<br>* dialed_interface_info<br><br>Added comment about __progname and environ being needed for FreeBSD to<br>prevent accidental removal in the future.<br><br>Change-Id: I3ae026bc541cd9cb572be2ffa95fc359547642b5<br>---<br>M include/asterisk/options.h<br>M main/asterisk.exports.in<br>M tests/test_amihooks.c<br>3 files changed, 3 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/include/asterisk/options.h b/include/asterisk/options.h<br>index 78f596a..730fd68 100644<br>--- a/include/asterisk/options.h<br>+++ b/include/asterisk/options.h<br>@@ -199,8 +199,6 @@<br> extern pid_t ast_mainpid;<br> <br> extern char record_cache_dir[AST_CACHE_DIR_LEN];<br>-extern char dahdi_chan_name[AST_CHANNEL_NAME];<br>-extern int dahdi_chan_name_len;<br> <br> extern int ast_language_is_prefix;<br> <br>diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in<br>index f997587..b434d38 100644<br>--- a/main/asterisk.exports.in<br>+++ b/main/asterisk.exports.in<br>@@ -13,9 +13,6 @@<br>                 LINKER_SYMBOL_PREFIX__ao2_*;<br>          LINKER_SYMBOL_PREFIXoption_debug;<br>             LINKER_SYMBOL_PREFIXoption_verbose;<br>-          LINKER_SYMBOL_PREFIXdahdi_chan_name;<br>-         LINKER_SYMBOL_PREFIXdahdi_chan_name_len;<br>-             LINKER_SYMBOL_PREFIXdahdi_chan_mode;<br>          LINKER_SYMBOL_PREFIXcallerid_*;<br>               LINKER_SYMBOL_PREFIXcid_di;<br>           LINKER_SYMBOL_PREFIXcid_dr;<br>@@ -30,8 +27,6 @@<br>                LINKER_SYMBOL_PREFIXterm_*;<br>           LINKER_SYMBOL_PREFIXchannelreloadreason2txt;<br>          LINKER_SYMBOL_PREFIXdevstate2str;<br>-            LINKER_SYMBOL_PREFIX__manager_event;<br>-         LINKER_SYMBOL_PREFIXdialed_interface_info;<br>            LINKER_SYMBOL_PREFIXstrsep;<br>           LINKER_SYMBOL_PREFIXsetenv;<br>           LINKER_SYMBOL_PREFIXstasis_*;<br>@@ -49,6 +44,7 @@<br>              LINKER_SYMBOL_PREFIXres_srtp;<br>                 LINKER_SYMBOL_PREFIXres_srtp_policy;<br>          LINKER_SYMBOL_PREFIXsecure_call_info;<br>+                /* __progname and environ are needed by FreeBSD for bundled pjproject. */<br>             LINKER_SYMBOL_PREFIX__progname;<br>               LINKER_SYMBOL_PREFIXenviron;<br>          /*<br>diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c<br>index 14cfbdd..c465a3d 100644<br>--- a/tests/test_amihooks.c<br>+++ b/tests/test_amihooks.c<br>@@ -90,7 +90,8 @@<br>    return wait_for_hook(test) ? AST_TEST_FAIL : AST_TEST_PASS;<br> }<br> <br>-/* The helper function is required by struct manager_custom_hook. See __manager_event for details */<br>+/* The helper function is required by struct manager_custom_hook.<br>+ * See __ast_manager_event_multichan for details */<br> static int amihook_helper(int category, const char *event, char *content)<br> {<br>   ast_log(LOG_NOTICE, "AMI Event: \nCategory: %d Event: %s\n%s\n", category, event, content);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8576">change 8576</a>. To unsubscribe, 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/8576"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3ae026bc541cd9cb572be2ffa95fc359547642b5 </div>
<div style="display:none"> Gerrit-Change-Number: 8576 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>