[Mesa-dev] [PATCH] st/nine: clean up WINAPI definition

Christian Schmidbauer ch.schmidbauer at gmail.com
Wed May 4 18:46:25 UTC 2016


On Sun, May 1, 2016 at 12:02 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Hi Christian,
>
> On 29 April 2016 at 19:53, Christian Schmidbauer
> <ch.schmidbauer at gmail.com> wrote:
>> As Emil pointed out, only gcc, clang and MSVC compatibility is required.
>> Hence the check for GNUC can be skipped, as __i386__ and __x86_64__ are
>> only defined for gcc/clang, not for MSVC.
>>
>> Remove the #undef which has been there for historic reasons, when wine
>> dlls for nine have been built inside mesa. Instead use #ifndef in order
>> to avoid redefining WINAPI from MSVC's headers.
> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>
> Thanks for picking this up. Should we apply this for stable as well
> (considering the patch it 'fixes' is already in there) ?
> I'm slightly concerned about the removal of undef WINAPI - I take it
> that you've tested the patch ?
>
> Humbly waiting for an ack/r-b/t-b from someone (else) involved in Nine ;-)
>
> Thanks
> Emil

I didn't CC stable as the patch just cleans up the code and does not
really fix anything. I don't mind applying this to stable though.

I also talked to zhasha on IRC and he also thinks it was only
necessary in the past. I did test the patch with wine (on amd64) and
Xnine (on x32, i386).


More information about the mesa-dev mailing list