Permalink
Browse files

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
  • Loading branch information...
2 parents 9e6214f + b586731 commit 676982407bf45c437de8059def8b7ce7435162cf @gustehn gustehn committed Mar 15, 2013
Showing with 4 additions and 4 deletions.
  1. +1 −1 erts/emulator/sys/common/erl_mseg.c
  2. +1 −1 lib/os_mon/c_src/memsup.c
  3. +2 −2 lib/wx/configure.in
@@ -439,7 +439,7 @@ mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size) {
}
#if HAVE_MSEG_RECREATE
-#if defined(__NetBsd__)
+#if defined(__NetBSD__)
#define MREMAP_FLAGS (0)
#else
#define MREMAP_FLAGS (MREMAP_MAYMOVE)
@@ -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
View
@@ -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.*)

0 comments on commit 6769824

Please sign in to comment.