[1/5] resend include: bring in6_addr into line with the MS definition

Alexandre Julliard julliard at winehq.org
Tue Apr 7 08:45:56 CDT 2009


Jeff Latimer <lats at yless4u.com.au> writes:

> +#ifdef USE_WS_PREFIX
> +#define WS(x)    WS_##x
> +#else
> +#define WS(x)    x
> +#endif
> +
> +struct WS(in6_addr) {
> +    union {
> +        WS(u_char)  Byte[16];
> +        WS(u_short) Word[8];
> +    } u;
> +} IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR;
> +
> +#define in_addr6 WS(in6_addr)
> +
> +#define _S6_un     u
> +#define _S6_u8     Byte
> +#ifndef USE_WS_PREFIX
> +#define s6_addr    _S6_un._S6_u8
> +#else
> +#define WS_s6_addr _S6_un._S6_u8
> +#endif
> +
> +#define s6_bytes   u.Byte
> +#define s6_words   u.Word

You need the WS prefix on all definitions that can potentially conflict
with Unix.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list