wxMGL/Watcom linkage fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
#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
|
||||
//
|
||||
// http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
|
||||
|
@@ -34,7 +34,11 @@ extern "C"
|
||||
#include "wx/module.h"
|
||||
|
||||
#ifndef TIFFLINKAGEMODE
|
||||
#define TIFFLINKAGEMODE LINKAGEMODE
|
||||
#if defined(__WATCOMC__) && defined(__WXMGL__)
|
||||
#define TIFFLINKAGEMODE cdecl
|
||||
#else
|
||||
#define TIFFLINKAGEMODE LINKAGEMODE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user