Author: mjordan Date: Sun Mar 22 15:32:17 2015 New Revision: 433245 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433245 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) Modified: branches/11/main/asterisk.c branches/11/main/xmldoc.c Modified: branches/11/main/asterisk.c URL: http://svnview.digium.com/svn/asterisk/branches/11/main/asterisk.c?view=diff&rev=433245&r1=433244&r2=433245 ============================================================================== --- branches/11/main/asterisk.c (original) +++ branches/11/main/asterisk.c Sun Mar 22 15:32:17 2015 @@ -87,11 +87,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: branches/11/main/xmldoc.c URL: http://svnview.digium.com/svn/asterisk/branches/11/main/xmldoc.c?view=diff&rev=433245&r1=433244&r2=433245 ============================================================================== --- branches/11/main/xmldoc.c (original) +++ branches/11/main/xmldoc.c Sun Mar 22 15:32:17 2015 @@ -2413,7 +2413,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
