Re: [REGRESSION] Fix dlls/iphlpapi/ipstats.c on FreeBSD 6.4/i386

[Austin English]

On Mon, Jan 26, 2009 at 5:43 PM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote:
> After Austin's recent changes (that were committed in the last 24h),
> Wine no longer builds for me on FreeBSD 6.4/i386 with the following
> failure mode.
>
> In file included from ipstats.c:71:
>  /usr/include/netinet/ip.h:160: error: expected specifier-qualifier-list before 'n_long'
>  gmake[2]: *** [ipstats.o] Error 1
>  gmake[2]: Leaving directory `/sw/test/Wine/dlls/iphlpapi'
>  gmake[1]: *** [iphlpapi] Error 2
>  gmake[1]: Leaving directory `/sw/test/Wine/dlls'
>  gmake: *** [dlls] Error 2
>
> The patch below fixes this.
>
> Gerald
>
> ChangeLog:
> Move #include <netinet/in_systm.h> before #include <netinet/ip.h> to
> fix FreeBSD 6.4.
>
> Index: dlls/iphlpapi/ipstats.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/iphlpapi/ipstats.c,v
> retrieving revision 1.43
> diff -u -3 -p -r1.43 ipstats.c
> --- dlls/iphlpapi/ipstats.c     23 Jan 2009 16:07:29 -0000      1.43
> +++ dlls/iphlpapi/ipstats.c     26 Jan 2009 22:42:34 -0000
> @@ -67,6 +67,9 @@
>  #ifdef HAVE_NETINET_IF_INARP_H
>  #include <netinet/if_inarp.h>
>  #endif
> +#ifdef HAVE_NETINET_IN_SYSTM_H
> +#include <netinet/in_systm.h>
> +#endif
>  #ifdef HAVE_NETINET_IP_H
>  #include <netinet/ip.h>
>  #endif
> @@ -88,9 +91,6 @@
>  #ifdef HAVE_NETINET_TCP_VAR_H
>  #include <netinet/tcp_var.h>
>  #endif
> -#ifdef HAVE_NETINET_IN_SYSTM_H
> -#include <netinet/in_systm.h>
> -#endif
>  #ifdef HAVE_NETINET_IP_ICMP_H
>  #include <netinet/ip_icmp.h>
>  #endif

I've already sent a patch for this:

http://www.winehq.org/pipermail/wine-patches/2009-January/068396.html

-- 
-Austin