diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-05-07 07:04:43 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-07 07:04:43 -0500 |
| commit | f451af65c4fd27b0e80ccb32612ce25a6ab3791c (patch) | |
| tree | 20e811fcc27887d51dbb2c9327eeb0a2c89effcd /include/asterisk/data.h | |
| parent | 1bf91fbc7325946914e8ab94eedd6849779faff7 (diff) | |
| parent | df6c1d755f39308c77f3c49ef0f5fa539e627330 (diff) | |
Merge topics 'ASTERISK-25049', 'ASTERISK-25056'
* changes:
CLI: Enable automatic references to modules.
Modules: Make ast_module_info->self available to auxiliary sources.
Diffstat (limited to 'include/asterisk/data.h')
| -rw-r--r-- | include/asterisk/data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/data.h b/include/asterisk/data.h index 3676b8df5..d6da1f7d6 100644 --- a/include/asterisk/data.h +++ b/include/asterisk/data.h @@ -360,7 +360,7 @@ struct ast_data_mapping_structure { */ int __ast_data_register(const char *path, const struct ast_data_handler *handler, const char *registrar, struct ast_module *mod); -#define ast_data_register(path, handler) __ast_data_register(path, handler, __FILE__, ast_module_info->self) +#define ast_data_register(path, handler) __ast_data_register(path, handler, __FILE__, AST_MODULE_SELF) #define ast_data_register_core(path, handler) __ast_data_register(path, handler, __FILE__, NULL) /*! @@ -376,7 +376,7 @@ int __ast_data_register(const char *path, const struct ast_data_handler *handler int __ast_data_register_multiple(const struct ast_data_entry *data_entries, size_t entries, const char *registrar, struct ast_module *mod); #define ast_data_register_multiple(data_entries, entries) \ - __ast_data_register_multiple(data_entries, entries, __FILE__, ast_module_info->self) + __ast_data_register_multiple(data_entries, entries, __FILE__, AST_MODULE_SELF) #define ast_data_register_multiple_core(data_entries, entries) \ __ast_data_register_multiple(data_entries, entries, __FILE__, NULL) |