diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-07 12:20:44 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-07 12:20:44 +0000 |
| commit | 7df6611bd27389f5fa73eea55ac0b1dcf54dda25 (patch) | |
| tree | f250448936a4941b62336a7baef13582f16d07e9 /plugins/BasicHistory/src/zip/ioapi.h | |
| parent | 20928b2140adc81e9b3fcbbcc855d7e6ed2d4358 (diff) | |
minizip updated
zlib libs removed coz we have dll in miranda
git-svn-id: http://svn.miranda-ng.org/main/trunk@5610 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/BasicHistory/src/zip/ioapi.h')
| -rw-r--r-- | plugins/BasicHistory/src/zip/ioapi.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/BasicHistory/src/zip/ioapi.h b/plugins/BasicHistory/src/zip/ioapi.h index 8309c4cf8f..c51b7297d5 100644 --- a/plugins/BasicHistory/src/zip/ioapi.h +++ b/plugins/BasicHistory/src/zip/ioapi.h @@ -21,7 +21,7 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. @@ -38,17 +38,23 @@ #ifndef _FILE_OFFSET_BIT #define _FILE_OFFSET_BIT 64 #endif + #endif #include <stdio.h> #include <stdlib.h> -#include "zlib.h" +#include "..\..\..\Zlib\src\zlib.h" #if defined(USE_FILE32API) #define fopen64 fopen #define ftello64 ftell #define fseeko64 fseek #else +#ifdef __FreeBSD__ +#define fopen64 fopen +#define ftello64 ftello +#define fseeko64 fseeko +#endif #ifdef _MSC_VER #define fopen64 fopen #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC))) @@ -85,6 +91,8 @@ typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; typedef uint64_t ZPOS64_T; #else +/* Maximum unsigned 32-bit value used as placeholder for zip64 */ +#define MAXU32 0xffffffff #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 ZPOS64_T; |