summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/asterisk.c2
-rw-r--r--main/loader.c2
-rw-r--r--main/xmldoc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index eddb20383..08d9ae15e 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -171,12 +171,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#elif defined(HAVE_SYSCTL)
#include <sys/param.h>
#include <sys/sysctl.h>
-#if !defined(__OpenBSD__)
#include <sys/vmmeter.h>
#if defined(__FreeBSD__)
#include <vm/vm_param.h>
#endif
-#endif
#if defined(HAVE_SWAPCTL)
#include <sys/swap.h>
#endif
diff --git a/main/loader.c b/main/loader.c
index f2f3e234a..3a596bcf4 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
diff --git a/main/xmldoc.c b/main/xmldoc.c
index e334e878e..2f4f063b9 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -2979,7 +2979,7 @@ int ast_xmldoc_load_documentation(void)
globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf);
#endif
- ast_debug(3, "gl_pathc %zu\n", globbuf.gl_pathc);
+ ast_debug(3, "gl_pathc %zu\n", (size_t)globbuf.gl_pathc);
if (globret == GLOB_NOSPACE) {
ast_log(LOG_WARNING, "XML load failure, glob expansion of pattern '%s' failed: Not enough memory\n", xmlpattern);
ast_free(xmlpattern);