Details
-
Task
-
Resolution: Out of scope
-
P3: Somewhat important
-
None
-
None
Description
We need to send the following patch upstream at some point:
— a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -1330,7 +1330,7 @@ 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 (_MSC_VER) && (_MSC_VER >= 800)) || defined(WINSCW_)
- if defined(_GNUC_) || (defined (_MSC_VER) && (_MSC_VER >= 800))
- define PNGAPI __cdecl
- else
- define PNGAPI _cdecl