summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2009-10-15 13:01:05 (GMT)
committeraavit <qt-info@nokia.com>2009-10-22 09:56:09 (GMT)
commitc74240bf4ab182f13b18271831fd6deebfe573f6 (patch)
treec11d10f4fcb58a10d5e4f3354dda73f88c458ae1 /src/3rdparty/libpng
parented1892665111f900e4d831a41b4ec79666931f0d (diff)
downloadQt-c74240bf4ab182f13b18271831fd6deebfe573f6.zip
Qt-c74240bf4ab182f13b18271831fd6deebfe573f6.tar.gz
Qt-c74240bf4ab182f13b18271831fd6deebfe573f6.tar.bz2
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.
Diffstat (limited to 'src/3rdparty/libpng')
-rw-r--r--src/3rdparty/libpng/pngconf.h14
1 files 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 <strings.h>
#else
# include <string.h>
@@ -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 <qconfig.h>
+# if defined(QT_VISIBILITY_AVAILABLE)
+# define PNG_IMPEXP __attribute__((visibility("default")))
+# endif
+# endif
+
#endif
#ifndef PNGAPI