diff options
author | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:11:32 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:11:32 +0000 |
commit | 66670f02e6d662bee74e9a9cefc947da3bd1ed6f (patch) | |
tree | 7e617fcf556de9b3fe43352091c093e1b3197718 /main/loader.c | |
parent | 7e097bce8687256ee400347245b7956c8e2fc452 (diff) |
Fix compilation issues for OpenBSD
This patch addresses compilation issues for OpenBSD. Specifically, it
addresses:
* It allows including <sys/vmmeter.h> in asterisk.c
* Provides a needed (size_t) cast in xmldoc.c
In 13+, it also addresses a conditional inclusion in loader.c.
Review: https://reviewboard.asterisk.org/r/4506
ASTERISK-24880 #close
Reported by: snuffy
Tested by: snuffy
patches:
misc-openbsd.diff uploaded by snuffy (License 5024)
........
Merged revisions 433245 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 433247 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/loader.c')
-rw-r--r-- | main/loader.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/loader.c b/main/loader.c index b14914acb..5df306c91 100644 --- a/main/loader.c +++ b/main/loader.c @@ -483,7 +483,9 @@ static int is_module_loaded(const char *resource_name) static void unload_dynamic_module(struct ast_module *mod) { +#if defined(HAVE_RTLD_NOLOAD) char *name = ast_strdupa(ast_module_name(mod)); +#endif void *lib = mod->lib; /* WARNING: the structure pointed to by mod is going to |