aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-15 14:14:18 +0100
committerFredrik Gustafsson <[email protected]>2013-03-15 14:14:18 +0100
commit676982407bf45c437de8059def8b7ce7435162cf (patch)
tree6edc14867d105897b1065c60fbb3b00d4f061d0e /lib
parent9e6214fb792adbe566bc0155c7050a07a531a825 (diff)
parentb5867317c9fd70497c09f7f0006a9763d024e6a8 (diff)
downloadotp-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')
-rw-r--r--lib/os_mon/c_src/memsup.c2
-rwxr-xr-xlib/wx/configure.in4
2 files changed, 3 insertions, 3 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
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 6a0d649ccd..9c55e544a4 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -71,7 +71,7 @@ WXERL_CAN_BUILD_DRIVER=true
LM_WINDOWS_ENVIRONMENT
-if test X"$MIXED_CYGWIN_VC" == X"yes" -o X"$MIXED_MSYS_VC" == X"yes"; then
+if test X"$MIXED_CYGWIN_VC" = X"yes" -o X"$MIXED_MSYS_VC" = X"yes"; then
CFLAGS="-Owx"
fi
@@ -336,7 +336,7 @@ dnl
if test "$cross_compiling" = "yes"; then
echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
WXERL_CAN_BUILD_DRIVER=false
-elif test X"$MIXED_CYGWIN_VC" == X"no" -a X"$MIXED_MSYS_VC" == X"no"; then
+elif test X"$MIXED_CYGWIN_VC" = X"no" -a X"$MIXED_MSYS_VC" = X"no"; then
WX_VERSION=`wx-config --version`
case $WX_VERSION in
2.8.*)