354963 - OS/2 needs extra changes to cairo files

Status: RESOLVED FIXED

(Core Graveyard :: GFX, defect)

Description

[Peter Weilbacher]

Since the cairo sync of bug 354388 we finally have the cairo-os2* files but some extra changes are still necessary to get a SVG-enabled build on OS/2.

- A line @OS2_SURFACE_FEATURE@ to be added to cairo-features.h.in.
- We need to decide what to do with CAIRO_BUILD_DLL.
- The lines in cairo.h about XP_OS2_VACPP are obsolete and need to be
  replaced with something for the normal XP_OS2 GCC build.

- Additionally, depending on the handling of CAIRO_BUILD_DLL, we need to
  decide where to call cairo_os2_init()/_fini(), nsSVGOuterSVGFrame
  is probably a good place for non-Thebes builds.

Comment 1

[Peter Weilbacher]

Attachment: The bits for gfx/cairo/cairo/src

This makes two small changes to files that seem to be Mozilla only (not in upstream cairo, or not any more), so I don't think that I have to add something to gfx/cairo/README.

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 240826 [details] [diff] [review]
The bits for gfx/cairo/cairo/src

Is __declspec actually a #define?  r=me if so.. (I thought it was a direct compiler instruction)

Also, please stick a new line after the if defined(XP_OS2), just for consistency's sake

Comment 3

[Andy Willis (abwillis)]

Yes, in the OS/2 gcc compiler __declspec is defined (internally) where we can do this check.

Comment 4

[Peter Weilbacher]

Checked into trunk (with extra newline as requested). The build issues should be resolved with this.

What I wrote in comment 0 about cairo_os2_init()/_fini() will be addressed seperately in bug 355043, marking this fixed.