83 lines
3.3 KiB
Diff
83 lines
3.3 KiB
Diff
diff -up ZipArchive-4.1.1/ZipArchive/DeflateCompressor.cpp.system-zlib ZipArchive-4.1.1/ZipArchive/DeflateCompressor.cpp
|
|
--- ZipArchive-4.1.1/ZipArchive/DeflateCompressor.cpp.system-zlib 2011-06-28 09:45:36.000000000 +0200
|
|
+++ ZipArchive-4.1.1/ZipArchive/DeflateCompressor.cpp 2011-12-23 11:07:14.000000000 +0100
|
|
@@ -14,7 +14,7 @@
|
|
|
|
#include "stdafx.h"
|
|
#include "DeflateCompressor.h"
|
|
-#include "zlib/deflate.h"
|
|
+#include <zlib.h>
|
|
|
|
namespace ZipArchiveLib
|
|
{
|
|
diff -up ZipArchive-4.1.1/ZipArchive/DeflateCompressor.h.system-zlib ZipArchive-4.1.1/ZipArchive/DeflateCompressor.h
|
|
--- ZipArchive-4.1.1/ZipArchive/DeflateCompressor.h.system-zlib 2011-06-28 09:45:36.000000000 +0200
|
|
+++ ZipArchive-4.1.1/ZipArchive/DeflateCompressor.h 2011-12-23 11:07:14.000000000 +0100
|
|
@@ -28,7 +28,7 @@
|
|
#include "ZipExport.h"
|
|
#include "BaseLibCompressor.h"
|
|
#include "ZipException.h"
|
|
-#include "zlib/zlib.h"
|
|
+#include <zlib.h>
|
|
|
|
namespace ZipArchiveLib
|
|
{
|
|
diff -up ZipArchive-4.1.1/ZipArchive/_platform.h.system-zlib ZipArchive-4.1.1/ZipArchive/_platform.h
|
|
--- ZipArchive-4.1.1/ZipArchive/_platform.h.system-zlib 2011-12-23 11:07:14.000000000 +0100
|
|
+++ ZipArchive-4.1.1/ZipArchive/_platform.h 2011-12-23 11:07:14.000000000 +0100
|
|
@@ -63,4 +63,19 @@
|
|
#error Using MFC under a non-Windows platform is not supported
|
|
#endif
|
|
|
|
+// revert symbol names back to system zlib
|
|
+#define zarch_alloc_func alloc_func
|
|
+#define zarch_free_func free_func
|
|
+#define zarch_uInt uInt
|
|
+#define zarch_Bytef Bytef
|
|
+#define zarch_z_stream z_stream
|
|
+#define zarch_crc32 crc32
|
|
+#define zarch_deflateInit2_ deflateInit2_
|
|
+#define zarch_deflate deflate
|
|
+#define zarch_deflateEnd deflateEnd
|
|
+#define zarch_inflateInit2_ inflateInit2_
|
|
+#define zarch_inflate inflate
|
|
+#define zarch_inflateEnd inflateEnd
|
|
+#define zarch_get_crc_table get_crc_table
|
|
+
|
|
#endif // !defined(ZIPARCHIVE_PLATFORM_DOT_H)
|
|
diff -up ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h.system-zlib ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h
|
|
--- ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h.system-zlib 2011-06-28 09:45:36.000000000 +0200
|
|
+++ ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h 2011-12-23 11:07:14.000000000 +0100
|
|
@@ -25,7 +25,7 @@
|
|
#pragma once
|
|
#endif
|
|
|
|
-#include "zlib/zlib.h"
|
|
+#include <zlib.h>
|
|
|
|
#include "ZipCryptograph.h"
|
|
#include "ZipFileHeader.h"
|
|
diff -up ZipArchive-4.1.1/ZipArchive/ZipException.cpp.system-zlib ZipArchive-4.1.1/ZipArchive/ZipException.cpp
|
|
--- ZipArchive-4.1.1/ZipArchive/ZipException.cpp.system-zlib 2011-06-28 09:45:36.000000000 +0200
|
|
+++ ZipArchive-4.1.1/ZipArchive/ZipException.cpp 2011-12-23 11:07:14.000000000 +0100
|
|
@@ -14,7 +14,7 @@
|
|
|
|
#include "stdafx.h"
|
|
#include "ZipException.h"
|
|
-#include "zlib/zlib.h"
|
|
+#include <zlib.h>
|
|
#include <errno.h>
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
diff -up ZipArchive-4.1.1/ZipArchive/ZipFileHeader.cpp.system-zlib ZipArchive-4.1.1/ZipArchive/ZipFileHeader.cpp
|
|
--- ZipArchive-4.1.1/ZipArchive/ZipFileHeader.cpp.system-zlib 2011-12-23 11:07:58.000000000 +0100
|
|
+++ ZipArchive-4.1.1/ZipArchive/ZipFileHeader.cpp 2011-12-23 11:08:07.000000000 +0100
|
|
@@ -22,7 +22,7 @@
|
|
|
|
#include "ZipCrc32Cryptograph.h"
|
|
#include "BytesWriter.h"
|
|
-#include "zlib/zlib.h"
|
|
+#include <zlib.h>
|
|
|
|
#define FILEHEADERSIZE 46
|
|
#define LOCALFILEHEADERSIZE 30
|