diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:04:53 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:04:53 +0000 |
| commit | 08a88aab159b99588bf705e3e325813c07ae5d0f (patch) | |
| tree | bd3daa36bd75e543525fad3d5daa90b4adb5960d /main/asterisk.c | |
| parent | 6ca98524bfc321c12398df5ed0cac6c7cad3c55c (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 0 insertions, 2 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 |