[cairo] Fix OS/2 build

[Dave Yeo]

On 11/12/08 05:04 pm, Dave Yeo wrote:
>> 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.

Ok, with your updated fontconfig the Seamonkey build dies in 
mozilla/widget/src/os2/nsFrameWindow.cpp with

In file included from ../../../dist/include/cairo/cairo-os2.h:51,
                  from ../../../dist/include/thebes/gfxOS2Surface.h:45,
                  from I:/comm-central/mozilla/widget/src/os2/nsWindow.h:61,
                  from 
I:/comm-central/mozilla/widget/src/os2/nsFrameWindow.h:48,
                  from 
I:/comm-central/mozilla/widget/src/os2/nsFrameWindow.cpp:55:
I:/USR/include/os2emx.h:254: error: conflicting declaration 'typedef 
long long int LONGLONG'
I:/OS2TK45/H/os2def.h:695: error: 'LONGLONG' has a previous declaration 
as `typedef struct _LONGLONG LONGLONG'
I:/USR/include/os2emx.h:254: error: declaration of `typedef long long 
int LONGLONG'
...
another 1700+ lines of errors

With my original simple patch the build continues until dying due to 
missing symbols from moz_media
Dave