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
erlang · Mar 15, 2013 · 6769824 · 6769824
2 parents 9e6214f + b586731
commit 6769824
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
@@ -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)

diff --git 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
@@ -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.*)