Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted SciTech sabotage of Watcom compilation (invalid definition of PNG,TIFF LINKAGEMODE)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-08 23:25:56 +00:00
parent f725b2a4ec
commit 0729bd19f1
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imagpng.cpp
View File

@@ -56,12 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
#if wxUSE_LIBPNG #if wxUSE_LIBPNG
#if defined(__VISAGECPP__) #ifndef PNGLINKAGEMODE
#define PNGLINKAGEMODE _Optlink #define PNGLINKAGEMODE LINKAGEMODE
#elif defined(__WATCOMC__) && !defined(__DOS__)
#define PNGLINKAGEMODE _cdecl
#else
#define PNGLINKAGEMODE
#endif #endif
static void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length ) static void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length )

26
src/common/imagtiff.cpp
View File

@@ -37,19 +37,17 @@ extern "C"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/module.h" #include "wx/module.h"
#if defined(__WATCOMC__) && !defined(__DOS__) #ifndef TIFFLINKAGEMODE
#ifdef LINKAGEMODE #define TIFFLINKAGEMODE LINKAGEMODE
#undef LINKAGEMODE
#define LINKAGEMODE __cdecl
#endif
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxTIFFHandler // wxTIFFHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
static tsize_t LINKAGEMODE static tsize_t TIFFLINKAGEMODE
_tiffNullProc(thandle_t WXUNUSED(handle), _tiffNullProc(thandle_t WXUNUSED(handle),
tdata_t WXUNUSED(buf), tdata_t WXUNUSED(buf),
tsize_t WXUNUSED(size)) tsize_t WXUNUSED(size))
@@ -57,7 +55,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
return (tsize_t) -1; return (tsize_t) -1;
} }
static tsize_t LINKAGEMODE static tsize_t TIFFLINKAGEMODE
_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
{ {
wxInputStream *stream = (wxInputStream*) handle; wxInputStream *stream = (wxInputStream*) handle;
@@ -65,7 +63,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
return stream->LastRead(); return stream->LastRead();
} }
static tsize_t LINKAGEMODE static tsize_t TIFFLINKAGEMODE
_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
{ {
wxOutputStream *stream = (wxOutputStream*) handle; wxOutputStream *stream = (wxOutputStream*) handle;
@@ -73,7 +71,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
return stream->LastWrite(); return stream->LastWrite();
} }
static toff_t LINKAGEMODE static toff_t TIFFLINKAGEMODE
_tiffSeekIProc(thandle_t handle, toff_t off, int whence) _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
{ {
wxInputStream *stream = (wxInputStream*) handle; 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 ); 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) _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
{ {
wxOutputStream *stream = (wxOutputStream*) handle; 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 ); return (toff_t)stream->SeekO( (off_t)off, mode );
} }
static int LINKAGEMODE static int TIFFLINKAGEMODE
_tiffCloseProc(thandle_t WXUNUSED(handle)) _tiffCloseProc(thandle_t WXUNUSED(handle))
{ {
return 0; // ? return 0; // ?
} }
static toff_t LINKAGEMODE static toff_t TIFFLINKAGEMODE
_tiffSizeProc(thandle_t handle) _tiffSizeProc(thandle_t handle)
{ {
wxStreamBase *stream = (wxStreamBase*) handle; wxStreamBase *stream = (wxStreamBase*) handle;
return (toff_t) stream->GetSize(); return (toff_t) stream->GetSize();
} }
static int LINKAGEMODE static int TIFFLINKAGEMODE
_tiffMapProc(thandle_t WXUNUSED(handle), _tiffMapProc(thandle_t WXUNUSED(handle),
tdata_t* WXUNUSED(pbase), tdata_t* WXUNUSED(pbase),
toff_t* WXUNUSED(psize)) toff_t* WXUNUSED(psize))
@@ -126,7 +124,7 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
return 0; return 0;
} }
static void LINKAGEMODE static void TIFFLINKAGEMODE
_tiffUnmapProc(thandle_t WXUNUSED(handle), _tiffUnmapProc(thandle_t WXUNUSED(handle),
tdata_t WXUNUSED(base), tdata_t WXUNUSED(base),
toff_t WXUNUSED(size)) toff_t WXUNUSED(size))