kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +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)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@433245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2015-03-22 20:32:17 +00:00
parent 1e130f9297
commit c40a6caac3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/asterisk.c
View File

@@ -87,12 +87,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#elif defined(HAVE_SYSCTL) #elif defined(HAVE_SYSCTL)
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#if !defined(__OpenBSD__)
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm_param.h> #include <vm/vm_param.h>
#endif #endif
#endif
#if defined(HAVE_SWAPCTL) #if defined(HAVE_SWAPCTL)
#include <sys/swap.h> #include <sys/swap.h>
#endif #endif

2
main/xmldoc.c
View File

@@ -2413,7 +2413,7 @@ int ast_xmldoc_load_documentation(void)
globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf); globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf);
#endif #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) { if (globret == GLOB_NOSPACE) {
ast_log(LOG_WARNING, "XML load failure, glob expansion of pattern '%s' failed: Not enough memory\n", xmlpattern); ast_log(LOG_WARNING, "XML load failure, glob expansion of pattern '%s' failed: Not enough memory\n", xmlpattern);
ast_free(xmlpattern); ast_free(xmlpattern);