From c74240bf4ab182f13b18271831fd6deebfe573f6 Mon Sep 17 00:00:00 2001 From: aavit Date: Thu, 15 Oct 2009 15:01:05 +0200 Subject: Qt patches to libpng sources. This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40. --- src/3rdparty/libpng/pngconf.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index 5530bde..c1c1d92 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -354,7 +354,7 @@ # endif /* __linux__ */ #endif /* PNG_SETJMP_SUPPORTED */ -#ifdef BSD +#if defined(BSD) && !defined(VXWORKS) # include #else # include @@ -1357,7 +1357,9 @@ typedef z_stream FAR * png_zstreamp; defined(WIN32) || defined(_WIN32) || defined(__WIN32__) )) # ifndef PNGAPI -# if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800)) +# if (defined(__GNUC__) && defined(__arm__)) || defined (__ARMCC__) +# define PNGAPI +# elif defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800)) || defined(__WINSCW__) # define PNGAPI __cdecl # else # define PNGAPI _cdecl @@ -1407,6 +1409,14 @@ typedef z_stream FAR * png_zstreamp; # if 0 /* ... other platforms, with other meanings */ # endif # endif + +# if !defined(PNG_IMPEXP) +# include +# if defined(QT_VISIBILITY_AVAILABLE) +# define PNG_IMPEXP __attribute__((visibility("default"))) +# endif +# endif + #endif #ifndef PNGAPI -- cgit v0.12