From 4d97d44e14d05f9a6da2c5414209b3858d47a520 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 7 Dec 2001 22:39:59 +0000 Subject: [PATCH] (temporary) hotfix for Watcom/DOS and PNGLINKAGEMODE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 2 +- src/common/imagtiff.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index cbbc10b261..016e594e2b 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if defined(__VISAGECPP__) #define PNGLINKAGEMODE _Optlink -#elif defined(__WATCOMC__) +#elif defined(__WATCOMC__) && !defined(__DOS__) #define PNGLINKAGEMODE _cdecl #else #define PNGLINKAGEMODE diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 182a16f33a..e125218742 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -37,7 +37,7 @@ extern "C" #include "wx/intl.h" #include "wx/module.h" -#ifdef __WATCOMC__ +#if defined(__WATCOMC__) && !defined(__DOS__) #ifdef LINKAGEMODE #undef LINKAGEMODE #define LINKAGEMODE __cdecl -- 2.45.2