kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 14:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues for OpenBSD

Browse Source 
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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2015-03-22 23:04:53 +00:00
parent 6ca98524bf
commit 08a88aab15
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/asterisk.c
View File

@@ -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

2
main/loader.c
View File

@@ -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

2
main/xmldoc.c
View File

@@ -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);