[cairo] Fix OS/2 build

[Behdad Esfahbod]

Dave Yeo wrote:
> On 11/12/08 03:27 am, Peter Weilbacher wrote:
>> On 12.11.2008 08:53, Dave Yeo wrote:
>>> While moving pthread.h away fixed compiling cairo it did not fix
>>> Mozilla. I was hoping to trace the Mozilla problem better but no luck.
>>> The attached patch simplifies things by including os2.h directly, cleans
>>> up cairo-os2-surface.c somewhat and moves the include to cairo-os2.h.
>>> I don't really like moving the include<os2.h>  into a public header as it
>>> may also cause problems much like pthread.h has. Unluckily I can't
>>> really see another acceptable solution right now.
>>> Tested with GCC 3.3.5 and 3.4.6.
>> Have you also tested this new patch fully in the Mozilla environment? I would
>> expect it to break when compiling the gfxOS2* files, exactly for the reason
>> discussed elsewhere in this thread.
>> Did you uncover any new problems with your original (simpler) fix?
>>     Peter.
> 
> Seamonkey build makes it as far as linking thebes.dll before dying due 
> to the missing fontconfig symbols using gcc 3.4.6.
> The only problem with the original (simpler) fix was Behdad rejecting 
> the original patch.

That fix doesn't get you far because we have to include os2.h from
cairo-mutex-type-private.h anyway.  We HAVE to.

I'm going to commit the cairo-os2.h patch.

behdad

> Dave