Author: mjordan Date: Sun Mar 22 18:11:32 2015 New Revision: 433248 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433248 Log: 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 Modified: trunk/ (props changed) trunk/main/asterisk.c trunk/main/loader.c trunk/main/xmldoc.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/main/asterisk.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=433248&r1=433247&r2=433248 ============================================================================== --- trunk/main/asterisk.c (original) +++ trunk/main/asterisk.c Sun Mar 22 18:11:32 2015 @@ -171,11 +171,9 @@ #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> Modified: trunk/main/loader.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/loader.c?view=diff&rev=433248&r1=433247&r2=433248 ============================================================================== --- trunk/main/loader.c (original) +++ trunk/main/loader.c Sun Mar 22 18:11:32 2015 @@ -483,7 +483,9 @@ 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 Modified: trunk/main/xmldoc.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/xmldoc.c?view=diff&rev=433248&r1=433247&r2=433248 ============================================================================== --- trunk/main/xmldoc.c (original) +++ trunk/main/xmldoc.c Sun Mar 22 18:11:32 2015 @@ -2979,7 +2979,7 @@ 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); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
