From 1c8524a1a45de864a0c2b2e4a544c7e37501d3be Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 7 Mar 2013 11:57:44 +0900 Subject: compilation fix for NetBSD spells __NetBSD__ correctly. --- erts/emulator/sys/common/erl_mseg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3 From e66a60efcafb85c6bbfb6e1d08f850c42bee7a08 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 15 Nov 2012 18:51:21 +0900 Subject: compilation fix for NetBSD taken from a pkgsrc patch: patch-lib_os__mon_c__src_memsup.c --- lib/os_mon/c_src/memsup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c index 3a1a8e9444..2dad6c8e2d 100644 --- a/lib/os_mon/c_src/memsup.c +++ b/lib/os_mon/c_src/memsup.c @@ -104,6 +104,9 @@ #if !defined (__OpenBSD__) && !defined (__NetBSD__) #include #endif +#if defined (__NetBSD__) +#include +#endif #if defined (__FreeBSD__) || defined(__DragonFly__) #include #endif -- cgit v1.2.3 From c1fdb0879f8383dfd5ef6c5e5a198ee3ba19df28 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 7 Mar 2013 12:10:06 +0900 Subject: reduce bashism taken from from a pkgsrc patch: patch-lib_wx_configure.in --- lib/wx/configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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.*) -- cgit v1.2.3 From b5867317c9fd70497c09f7f0006a9763d024e6a8 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Fri, 15 Mar 2013 11:03:06 +0100 Subject: Moved ifdef NetBSD to proper place --- lib/os_mon/c_src/memsup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c index 2dad6c8e2d..8e610f951b 100644 --- a/lib/os_mon/c_src/memsup.c +++ b/lib/os_mon/c_src/memsup.c @@ -104,10 +104,7 @@ #if !defined (__OpenBSD__) && !defined (__NetBSD__) #include #endif -#if defined (__NetBSD__) -#include -#endif -#if defined (__FreeBSD__) || defined(__DragonFly__) +#if defined (__FreeBSD__) || defined(__DragonFly__) || defined (__NetBSD__) #include #endif #endif -- cgit v1.2.3