diff options
author | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:18 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:18 +0100 |
commit | 676982407bf45c437de8059def8b7ce7435162cf (patch) | |
tree | 6edc14867d105897b1065c60fbb3b00d4f061d0e /lib/os_mon | |
parent | 9e6214fb792adbe566bc0155c7050a07a531a825 (diff) | |
parent | b5867317c9fd70497c09f7f0006a9763d024e6a8 (diff) | |
download | otp-676982407bf45c437de8059def8b7ce7435162cf.tar.gz otp-676982407bf45c437de8059def8b7ce7435162cf.tar.bz2 otp-676982407bf45c437de8059def8b7ce7435162cf.zip |
Merge branch 'yt/netbsd/OTP-10941' into maint
* yt/netbsd/OTP-10941:
Moved ifdef NetBSD to proper place
reduce bashism
compilation fix for NetBSD
compilation fix for NetBSD
Diffstat (limited to 'lib/os_mon')
-rw-r--r-- | lib/os_mon/c_src/memsup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c index 3a1a8e9444..8e610f951b 100644 --- a/lib/os_mon/c_src/memsup.c +++ b/lib/os_mon/c_src/memsup.c @@ -104,7 +104,7 @@ #if !defined (__OpenBSD__) && !defined (__NetBSD__) #include <vm/vm_param.h> #endif -#if defined (__FreeBSD__) || defined(__DragonFly__) +#if defined (__FreeBSD__) || defined(__DragonFly__) || defined (__NetBSD__) #include <sys/vmmeter.h> #endif #endif |