From 0729bd19f1ab192fdc691ab511f0e0729315fe79 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 8 Dec 2001 23:25:56 +0000
Subject: [PATCH] reverted SciTech sabotage of Watcom compilation (invalid
 definition of PNG,TIFF LINKAGEMODE)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/imagpng.cpp  |  8 ++------
 src/common/imagtiff.cpp | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 016e594e2b..c8054c25e4 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -56,12 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 
 #if wxUSE_LIBPNG
 
-#if defined(__VISAGECPP__)
-#define PNGLINKAGEMODE _Optlink
-#elif defined(__WATCOMC__) && !defined(__DOS__)
-#define PNGLINKAGEMODE _cdecl
-#else
-#define PNGLINKAGEMODE
+#ifndef PNGLINKAGEMODE
+  #define PNGLINKAGEMODE LINKAGEMODE
 #endif
 
 static void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length )
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index e125218742..4cbf865fad 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -37,19 +37,17 @@ extern "C"
 #include "wx/intl.h"
 #include "wx/module.h"
 
-#if defined(__WATCOMC__) && !defined(__DOS__)
-#ifdef LINKAGEMODE
-#undef LINKAGEMODE
-#define LINKAGEMODE __cdecl
-#endif
+#ifndef TIFFLINKAGEMODE
+  #define TIFFLINKAGEMODE LINKAGEMODE
 #endif
+
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
-static tsize_t LINKAGEMODE
+static tsize_t TIFFLINKAGEMODE
 _tiffNullProc(thandle_t WXUNUSED(handle),
           tdata_t WXUNUSED(buf),
           tsize_t WXUNUSED(size))
@@ -57,7 +55,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
     return (tsize_t) -1;
 }
 
-static tsize_t LINKAGEMODE
+static tsize_t TIFFLINKAGEMODE
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
@@ -65,7 +63,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastRead();
 }
 
-static tsize_t LINKAGEMODE
+static tsize_t TIFFLINKAGEMODE
 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
@@ -73,7 +71,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastWrite();
 }
 
-static toff_t LINKAGEMODE
+static toff_t TIFFLINKAGEMODE
 _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;
@@ -89,7 +87,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 
-static toff_t LINKAGEMODE
+static toff_t TIFFLINKAGEMODE
 _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
@@ -105,20 +103,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekO( (off_t)off, mode );
 }
 
-static int LINKAGEMODE
+static int TIFFLINKAGEMODE
 _tiffCloseProc(thandle_t WXUNUSED(handle))
 {
     return 0;  // ?
 }
 
-static toff_t LINKAGEMODE
+static toff_t TIFFLINKAGEMODE
 _tiffSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 
-static int LINKAGEMODE
+static int TIFFLINKAGEMODE
 _tiffMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))
@@ -126,7 +124,7 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
     return 0;
 }
 
-static void LINKAGEMODE
+static void TIFFLINKAGEMODE
 _tiffUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
-- 
2.45.2