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

wxMGL/Watcom linkage fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-10 16:52:02 +00:00
parent a02d6c7b19
commit fc038829d5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/imagpng.cpp
View File

@@ -105,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
#if wxUSE_STREAMS #if wxUSE_STREAMS
#ifndef PNGLINKAGEMODE #ifndef PNGLINKAGEMODE
#if defined(__WATCOMC__) && defined(__WXMSW__) #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) )
// we need an explicit cdecl for Watcom, at least according to // 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 // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863

6
src/common/imagtiff.cpp
View File

@@ -34,7 +34,11 @@ extern "C"
#include "wx/module.h" #include "wx/module.h"
#ifndef TIFFLINKAGEMODE #ifndef TIFFLINKAGEMODE
#define TIFFLINKAGEMODE LINKAGEMODE #if defined(__WATCOMC__) && defined(__WXMGL__)
#define TIFFLINKAGEMODE cdecl
#else
#define TIFFLINKAGEMODE LINKAGEMODE
#endif
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------