Re: conflict between Wine and Solaris list.h fixed by AlekZ's workaround (Bug 11463)

[Alexandre Julliard]

Petr Sumbera  writes:
> diff --git a/server/fd.c b/server/fd.c
> index 41e404c..0010bab 100644
> --- a/server/fd.c
> +++ b/server/fd.c
> @@ -71,6 +71,18 @@
>  #include <sys/types.h>
>  #include <unistd.h>
>
> +/*
> - struct list is defined at sys/list_impl.h on solaris
> - this patches work around it.
>
> +*/
> +#define list WINELIST
> +#define list_remove WINELIST_REMOVE
> +#define list_next WINELIST_NEXT
> +#define list_prev WINELIST_PREV
> +#define list_head WINELIST_HEAD
> +#define list_tail WINELIST_TAIL
> +#define list_move_tail WINELIST_MOVE_TAIL
> -

You should do this the other way around, by defining list to
solaris_list before including the offending header, and undefining
it afterwards. This way the Wine code itself isn't impacted by
redefinitions.