(temporary) hotfix for Watcom/DOS and PNGLINKAGEMODE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index cbbc10b261a4942099c16711aac48cefc8b98d85..016e594e2bd1194fd778317d062f3e5ffdb4c5ba 100644 (file)
--- 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
 
 #if defined(__VISAGECPP__)
 #define PNGLINKAGEMODE _Optlink

-#elif defined(__WATCOMC__)
+#elif defined(__WATCOMC__) && !defined(__DOS__)

 #define PNGLINKAGEMODE _cdecl
 #else
 #define PNGLINKAGEMODE
 #define PNGLINKAGEMODE _cdecl
 #else
 #define PNGLINKAGEMODE

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 182a16f33af422a8b71c405dddba78f394ad4b39..e125218742c557930a20b9ab1e396a0b673c16b9 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -37,7 +37,7 @@ extern "C"
 #include "wx/intl.h"
 #include "wx/module.h"
 
 #include "wx/intl.h"
 #include "wx/module.h"
 

-#ifdef __WATCOMC__
+#if defined(__WATCOMC__) && !defined(__DOS__)

 #ifdef LINKAGEMODE
 #undef LINKAGEMODE
 #define LINKAGEMODE __cdecl
 #ifdef LINKAGEMODE
 #undef LINKAGEMODE
 #define LINKAGEMODE __cdecl