From c3b10b44346cc1003c9430ee6b65f934d9d9ce1d Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 7 May 2008 16:23:55 +0000 Subject: [PATCH] use PNGAPI if it is defined git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 0a5c3c4826..5d91abbe17 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -28,16 +28,12 @@ #ifndef WX_PRECOMP #include "wx/log.h" - #include "wx/app.h" - #include "wx/bitmap.h" - #include "wx/module.h" + #include "wx/intl.h" + #include "wx/palette.h" + #include "wx/stream.h" #endif -#include "png.h" -#include "wx/filefn.h" -#include "wx/wfstream.h" -#include "wx/intl.h" -#include "wx/palette.h" +#include // For memcpy #include @@ -99,7 +95,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_STREAMS #ifndef PNGLINKAGEMODE - #ifdef __WATCOMC__ + #ifdef PNGAPI + #define PNGLINKAGEMODE PNGAPI + #elif defined(__WATCOMC__) // 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 -- 2.45.2