From a5c2ac4fc22ab4be5e4d3248bdfb5872321aff6a Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 18 Mar 2009 02:39:36 +0000 Subject: a few more namespace updates... res_ael_share still needs some work before this can be merged to other release branches git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182848 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_ldap.c | 2 +- res/res_config_sqlite.c | 2 +- res/res_curl.c | 2 -- res/res_jabber.exports | 1 + res/res_odbc.c | 2 +- res/res_odbc.exports | 7 +++++++ res/res_phoneprov.c | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 7ff9015f2..770188fba 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -1758,7 +1758,7 @@ static char *realtime_ldap_status(struct ast_cli_entry *e, int cmd, struct ast_c return CLI_SUCCESS; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "LDAP realtime interface", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LDAP realtime interface", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index 483ab216b..611330f09 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -1862,7 +1862,7 @@ static int load_module(void) return 0; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Realtime SQLite configuration", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Realtime SQLite configuration", .load = load_module, .unload = unload_module, ); diff --git a/res/res_curl.c b/res/res_curl.c index 9e3284bd7..d2783ca10 100644 --- a/res/res_curl.c +++ b/res/res_curl.c @@ -71,5 +71,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "cURL Resource Module"); - - diff --git a/res/res_jabber.exports b/res/res_jabber.exports index 8df1fee0e..c20bd0256 100644 --- a/res/res_jabber.exports +++ b/res/res_jabber.exports @@ -8,6 +8,7 @@ ast_aji_invite_chat; ast_aji_join_chat; ast_aji_send; + ast_aji_send_chat; local: *; }; diff --git a/res/res_odbc.c b/res/res_odbc.c index ec883abf4..85de1fa87 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -133,7 +133,7 @@ struct odbc_class struct ao2_container *obj_container; }; -struct ao2_container *class_container; +static struct ao2_container *class_container; static AST_RWLIST_HEAD_STATIC(odbc_tables, odbc_cache_tables); diff --git a/res/res_odbc.exports b/res/res_odbc.exports index 1e38d49da..c874b5a84 100644 --- a/res/res_odbc.exports +++ b/res/res_odbc.exports @@ -1,9 +1,16 @@ { global: + ast_odbc_ast_str_SQLGetData; ast_odbc_backslash_is_escape; + ast_odbc_clear_cache; + ast_odbc_direct_execute; + ast_odbc_find_column; + ast_odbc_find_table; ast_odbc_prepare_and_execute; ast_odbc_release_obj; ast_odbc_request_obj; + ast_odbc_request_obj2; + ast_odbc_retrieve_transaction_obj; ast_odbc_sanity_check; ast_odbc_smart_execute; local: diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index d71139e13..cbd1eaaa0 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -1305,7 +1305,7 @@ static int reload(void) return 0; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "HTTP Phone Provisioning", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP Phone Provisioning", .load = load_module, .unload = unload_module, .reload = reload, -- cgit v1.2.3