[erlang-bugs] [erlang-patches] R13A patches for os_mon on dragonfly

[Björn-Egil Dahlberg]

Hi,

The patch was applied by hand and a typo was introduced.
Never do something yourself that a machine can do better ...

The corrected version is now in r13b.

// Björn-Egil
    Erlang/OTP

Kenji Rikitake wrote:
> Dear Bjorn and the list members:
> 
> R13B as of 2009-04-11 is broken for FreeBSD 7.1-RELEASE.
> Please fix it as proposed.
> 
> Kenji Rikitake
> 
> R13B snapshot of 2009-04-11
> has broken lib/os_mon/c_src/memsup.c
> for FreeBSD 7.1-RELEASE
> by Kenji Rikitake 12-APR-2009
> 
> Symptom: compilation error on lib/os_mon/c_src/memsup.c
> 
> Possible reason:
> 
> memsup.c was mangled between R13A and R13B, while trying to
> patch according to the "patch-aa" file in the following patch set
> for DragonFly BSD:
> 
> http://erlang.org/pipermail/erlang-patches/2009-April/000395.html
> 
> Workaround:
> 
> Apply the patch "patch-aa" in the above article AS IS, as follows.
> 
> --- lib/os_mon/c_src/memsup.c.FCS	2009-04-08 18:57:44.000000000 +0900
> +++ lib/os_mon/c_src/memsup.c	2009-04-12 15:50:34.000000000 +0900
> @@ -114,11 +114,11 @@
>  #include <sys/types.h>
>  #include <sys/sysctl.h>
>  #if !defined (__OpenBSD__) && !defined (__NetBSD__) 
>  #include <vm/vm_param.h>
>  #endif
> -#if defined (__FreeBSD__) && defined(__DragonFly__)
> +#if defined (__FreeBSD__) || defined(__DragonFly__)
>  #include <sys/vmmeter.h>
>  #endif
>  #endif
>  
>  #if defined (__linux__)