diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-20 11:40:39 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-20 11:40:39 -0500 |
| commit | 60a06fbd1df7a9f7c6e56cd09cf75620fab3e23c (patch) | |
| tree | 8517974b258f6638919333b9f18c86e06206f65f | |
| parent | f863f1f91bfcaa2b8a184a5edbfaf7b52930bdf8 (diff) | |
| parent | de77cf869890240f89f9115c6853e1a75c84c3ac (diff) | |
Merge "core: Remove dead symbols from asterisk.exports.in."
| -rw-r--r-- | include/asterisk/options.h | 2 | ||||
| -rw-r--r-- | main/asterisk.exports.in | 6 | ||||
| -rw-r--r-- | tests/test_amihooks.c | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/asterisk/options.h b/include/asterisk/options.h index fc366caa5..6cbde3040 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -202,8 +202,6 @@ extern struct timeval ast_lastreloadtime; extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; -extern char dahdi_chan_name[AST_CHANNEL_NAME]; -extern int dahdi_chan_name_len; extern int ast_language_is_prefix; diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in index f997587c9..b434d38af 100644 --- a/main/asterisk.exports.in +++ b/main/asterisk.exports.in @@ -13,9 +13,6 @@ LINKER_SYMBOL_PREFIX__ao2_*; LINKER_SYMBOL_PREFIXoption_debug; LINKER_SYMBOL_PREFIXoption_verbose; - LINKER_SYMBOL_PREFIXdahdi_chan_name; - LINKER_SYMBOL_PREFIXdahdi_chan_name_len; - LINKER_SYMBOL_PREFIXdahdi_chan_mode; LINKER_SYMBOL_PREFIXcallerid_*; LINKER_SYMBOL_PREFIXcid_di; LINKER_SYMBOL_PREFIXcid_dr; @@ -30,8 +27,6 @@ LINKER_SYMBOL_PREFIXterm_*; LINKER_SYMBOL_PREFIXchannelreloadreason2txt; LINKER_SYMBOL_PREFIXdevstate2str; - LINKER_SYMBOL_PREFIX__manager_event; - LINKER_SYMBOL_PREFIXdialed_interface_info; LINKER_SYMBOL_PREFIXstrsep; LINKER_SYMBOL_PREFIXsetenv; LINKER_SYMBOL_PREFIXstasis_*; @@ -49,6 +44,7 @@ LINKER_SYMBOL_PREFIXres_srtp; LINKER_SYMBOL_PREFIXres_srtp_policy; LINKER_SYMBOL_PREFIXsecure_call_info; + /* __progname and environ are needed by FreeBSD for bundled pjproject. */ LINKER_SYMBOL_PREFIX__progname; LINKER_SYMBOL_PREFIXenviron; /* diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c index 14cfbdd13..c465a3d86 100644 --- a/tests/test_amihooks.c +++ b/tests/test_amihooks.c @@ -90,7 +90,8 @@ AST_TEST_DEFINE(amihook_cli_send) return wait_for_hook(test) ? AST_TEST_FAIL : AST_TEST_PASS; } -/* The helper function is required by struct manager_custom_hook. See __manager_event for details */ +/* The helper function is required by struct manager_custom_hook. + * See __ast_manager_event_multichan for details */ static int amihook_helper(int category, const char *event, char *content) { ast_log(LOG_NOTICE, "AMI Event: \nCategory: %d Event: %s\n%s\n", category, event, content); |