From aaaa98306227171a7b0ffbc120bf57b44a79f704 Mon Sep 17 00:00:00 2001 From: "mozilla%weilbacher.org" Date: Mon, 2 Oct 2006 08:21:55 +0000 Subject: [PATCH] [OS/2] Bug 354963: extra changes to cairo files for OS/2, r=vlad --- gfx/cairo/cairo/src/cairo-features.h.in | 2 ++ gfx/cairo/cairo/src/cairo-platform.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-features.h.in b/gfx/cairo/cairo/src/cairo-features.h.in index 73c8517ddd28..eb8038c17a88 100644 --- a/gfx/cairo/cairo/src/cairo-features.h.in +++ b/gfx/cairo/cairo/src/cairo-features.h.in @@ -73,6 +73,8 @@ @WIN32_SURFACE_FEATURE@ +@OS2_SURFACE_FEATURE@ + @BEOS_SURFACE_FEATURE@ @GLITZ_SURFACE_FEATURE@ diff --git a/gfx/cairo/cairo/src/cairo-platform.h b/gfx/cairo/cairo/src/cairo-platform.h index 502c4f37fdd7..c8cf04f553cf 100644 --- a/gfx/cairo/cairo/src/cairo-platform.h +++ b/gfx/cairo/cairo/src/cairo-platform.h @@ -74,10 +74,14 @@ #define CCALLBACK_DECL #define CSTATIC_CALLBACK(__x) static __x -#elif defined(XP_OS2_VACPP) +#elif defined(XP_OS2) +#ifdef __declspec +#define cairo_public extern __declspec(dllexport) +#else #define cairo_public extern -#define CCALLBACK _Optlink +#endif +#define CCALLBACK #define CCALLBACK_DECL #define CSTATIC_CALLBACK(__x) static __x CCALLBACK