From 30e0e2518f3ad0e49ea9972d8e7f6a1ce5d1ec33 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 1 Jan 2003 23:18:44 +0000 Subject: [PATCH 1/1] tried to fix compilation with Watcom 11 (should fix the bug 651492) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 7e33316411..45dd9c46ca 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -57,7 +57,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_LIBPNG #ifndef PNGLINKAGEMODE - #define PNGLINKAGEMODE LINKAGEMODE + #ifdef __WATCOMC__ + // 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 + // + // more testing is needed for this however, please remove this comment + // if you can confirm that my fix works with Watcom 11 + #define PNGLINKAGEMODE cdecl + #else + #define PNGLINKAGEMODE LINKAGEMODE + #endif #endif -- 2.45.2