diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/openexr-1-disable-zlib_winapi.patch | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/openexr-1-disable-zlib_winapi.patch')
| -rw-r--r-- | src/openexr-1-disable-zlib_winapi.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/openexr-1-disable-zlib_winapi.patch b/src/openexr-1-disable-zlib_winapi.patch new file mode 100644 index 0000000..ef4d4c8 --- /dev/null +++ b/src/openexr-1-disable-zlib_winapi.patch @@ -0,0 +1,25 @@ +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> |