diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:25 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:25 +0100 |
| commit | 40a79961da84ad3c6f3f944cace806ac12161d40 (patch) | |
| tree | d3fd31f581609be0dacc2c84ceacbe291b6ee14a | |
| parent | 1990318baa032d1e65f3b39f420d9fbddb1bf830 (diff) | |
| parent | 676982407bf45c437de8059def8b7ce7435162cf (diff) | |
| download | otp-40a79961da84ad3c6f3f944cace806ac12161d40.tar.gz otp-40a79961da84ad3c6f3f944cace806ac12161d40.tar.bz2 otp-40a79961da84ad3c6f3f944cace806ac12161d40.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 2 | ||||
| -rw-r--r-- | lib/os_mon/c_src/memsup.c | 2 | ||||
| -rwxr-xr-x | lib/wx/configure.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index aa460420d5..b6e2c9382b 100644 --- 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 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.*) |