diff options
| author | aavit <qt-info@nokia.com> | 2009-10-15 13:01:05 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-15 13:35:50 (GMT) |
| commit | 8f9e4994350f5aff0ae9b3aaadd270c0d2358b17 (patch) | |
| tree | 31088d2bc109b06e172627dd2e23e335bc6189e9 /src/3rdparty | |
| parent | e9aac1679a651107735414a56ff04621d3287526 (diff) | |
| download | Qt-8f9e4994350f5aff0ae9b3aaadd270c0d2358b17.zip Qt-8f9e4994350f5aff0ae9b3aaadd270c0d2358b17.tar.gz Qt-8f9e4994350f5aff0ae9b3aaadd270c0d2358b17.tar.bz2 | |
Our modifications to libpng
This commit is the combination of earlier Qt patches to libpng,
reapplied here after the upgrade to 1.4.0.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libpng/pngconf.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index 3570fbe..9eec6d3 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -381,7 +381,7 @@ # endif /* __linux__ */ #endif /* PNG_SETJMP_SUPPORTED */ -#ifdef BSD +#if defined(BSD) && !defined(VXWORKS) # include <strings.h> #else # include <string.h> @@ -1224,7 +1224,9 @@ typedef char FAR * FAR * FAR * png_charppp; 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 @@ -1273,6 +1275,14 @@ typedef char FAR * FAR * FAR * png_charppp; # 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 |