From fc038829d566f4e0cfdb249fac1e67db8456e347 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 10 Jan 2006 16:52:02 +0000 Subject: [PATCH] wxMGL/Watcom linkage fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 2 +- src/common/imagtiff.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index ca4e72c240..fcb4b0a0e6 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -105,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_STREAMS #ifndef PNGLINKAGEMODE - #if defined(__WATCOMC__) && defined(__WXMSW__) + #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) ) // we need an explicit cdecl for Watcom, at least according to // // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863 diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 8c7d45a6fb..4c09339ca7 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -34,7 +34,11 @@ extern "C" #include "wx/module.h" #ifndef TIFFLINKAGEMODE - #define TIFFLINKAGEMODE LINKAGEMODE + #if defined(__WATCOMC__) && defined(__WXMGL__) + #define TIFFLINKAGEMODE cdecl + #else + #define TIFFLINKAGEMODE LINKAGEMODE + #endif #endif //----------------------------------------------------------------------------- -- 2.47.2