view src/openexr-1-disable-zlib_winapi.patch @ 3594:30f4b78227af

dbus update to 1.8.2, qt update to 4.8.6. * src/dbus.mk: update to version 1.8.2. * src/qt-1-cherrypicks.patch: update from latest mxe devel. * src/qt.mk: update to version 4.8.6.
author John Donoghue
date Tue, 13 May 2014 16:52:21 -0400
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp
--- a/IlmImf/ImfPxr24Compressor.cpp	2010-07-17 01:11:52.000000000 +0200
+++ b/IlmImf/ImfPxr24Compressor.cpp	2011-09-21 23:41:28.130452657 +0200
@@ -62,7 +62,6 @@
 //	string of bytes is compressed with zlib.
 //
 //-----------------------------------------------------------------------------
-#define ZLIB_WINAPI 
 
 #include <ImfPxr24Compressor.h>
 #include <ImfHeader.h>
diff -urN a/IlmImf/ImfZipCompressor.cpp b/IlmImf/ImfZipCompressor.cpp
--- a/IlmImf/ImfZipCompressor.cpp	2010-07-17 01:11:52.000000000 +0200
+++ b/IlmImf/ImfZipCompressor.cpp	2011-09-21 23:42:01.154288691 +0200
@@ -39,7 +39,6 @@
 //	class ZipCompressor
 //
 //-----------------------------------------------------------------------------
-#define ZLIB_WINAPI
 
 #include <ImfZipCompressor.h>
 #include <ImfCheckedArithmetic.h>