games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Unique macro for minizip exports. Define to nothing on non-msvc.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2013-08-01 22:37:08 +00:00
parent c57b159fc9
commit be3da8fcf8
6 changed files with 114 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/minizip/ioapi.h
View File

@@ -122,11 +122,14 @@ typedef uint64_t ZPOS64_T;
# endif # endif
# endif /* ZLIB_DLL */ # endif /* ZLIB_DLL */
#define DLL_EXPORT __declspec(dllexport) #ifdef MINIZIP_DLL
#define MINIZIP_EXPORT __declspec(dllexport)
#else
#define MINIZIP_EXPORT __declspec(dllimport)
#endif
#else //not MSVC
#define MINIZIP_EXPORT
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
lib/minizip/minizip.vcxproj
View File

@@ -112,7 +112,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MINIZIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MINIZIP_DLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -127,7 +127,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MINIZIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MINIZIP_DLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -145,7 +145,7 @@
<FunctionLevelLinking> <FunctionLevelLinking>
</FunctionLevelLinking> </FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_DLL;ZLIB_INTERNAL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MINIZIP_DLL;ZLIB_DLL;ZLIB_INTERNAL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>F:\Programowanie\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>F:\Programowanie\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
@@ -167,7 +167,7 @@
<FunctionLevelLinking> <FunctionLevelLinking>
</FunctionLevelLinking> </FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_DLL;ZLIB_INTERNAL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MINIZIP_DLL;ZLIB_DLL;ZLIB_INTERNAL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>F:\Programowanie\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>F:\Programowanie\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>

66
lib/minizip/unzip.c
View File

@@ -387,7 +387,7 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil
(like 1 on Unix, 2 on Windows) (like 1 on Unix, 2 on Windows)
*/ */
extern int DLL_EXPORT unzStringFileNameCompare (const char* fileName1, extern int MINIZIP_EXPORT unzStringFileNameCompare (const char* fileName1,
const char* fileName2, const char* fileName2,
int iCaseSensitivity) int iCaseSensitivity)
@@ -762,7 +762,7 @@ local unzFile unzOpenInternal (const void *path,
} }
extern unzFile DLL_EXPORT unzOpen2 (const char *path, extern unzFile MINIZIP_EXPORT unzOpen2 (const char *path,
zlib_filefunc_def* pzlib_filefunc32_def) zlib_filefunc_def* pzlib_filefunc32_def)
{ {
if (pzlib_filefunc32_def != NULL) if (pzlib_filefunc32_def != NULL)
@@ -775,7 +775,7 @@ extern unzFile DLL_EXPORT unzOpen2 (const char *path,
return unzOpenInternal(path, NULL, 0); return unzOpenInternal(path, NULL, 0);
} }
extern unzFile DLL_EXPORT unzOpen2_64 (const void *path, extern unzFile MINIZIP_EXPORT unzOpen2_64 (const void *path,
zlib_filefunc64_def* pzlib_filefunc_def) zlib_filefunc64_def* pzlib_filefunc_def)
{ {
if (pzlib_filefunc_def != NULL) if (pzlib_filefunc_def != NULL)
@@ -790,12 +790,12 @@ extern unzFile DLL_EXPORT unzOpen2_64 (const void *path,
return unzOpenInternal(path, NULL, 1); return unzOpenInternal(path, NULL, 1);
} }
extern unzFile DLL_EXPORT unzOpen (const char *path) extern unzFile MINIZIP_EXPORT unzOpen (const char *path)
{ {
return unzOpenInternal(path, NULL, 0); return unzOpenInternal(path, NULL, 0);
} }
extern unzFile DLL_EXPORT unzOpen64 (const void *path) extern unzFile MINIZIP_EXPORT unzOpen64 (const void *path)
{ {
return unzOpenInternal(path, NULL, 1); return unzOpenInternal(path, NULL, 1);
} }
@@ -805,7 +805,7 @@ extern unzFile DLL_EXPORT unzOpen64 (const void *path)
If there is files inside the .Zip opened with unzOpenCurrentFile (see later), If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
these files MUST be closed with unzCloseCurrentFile before call unzClose. these files MUST be closed with unzCloseCurrentFile before call unzClose.
return UNZ_OK if there is no problem. */ return UNZ_OK if there is no problem. */
extern int DLL_EXPORT unzClose (unzFile file) extern int MINIZIP_EXPORT unzClose (unzFile file)
{ {
unz64_s* s; unz64_s* s;
if (file==NULL) if (file==NULL)
@@ -825,7 +825,7 @@ extern int DLL_EXPORT unzClose (unzFile file)
Write info about the ZipFile in the *pglobal_info structure. Write info about the ZipFile in the *pglobal_info structure.
No preparation of the structure is needed No preparation of the structure is needed
return UNZ_OK if there is no problem. */ return UNZ_OK if there is no problem. */
extern int DLL_EXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info) extern int MINIZIP_EXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
{ {
unz64_s* s; unz64_s* s;
if (file==NULL) if (file==NULL)
@@ -835,7 +835,7 @@ extern int DLL_EXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglob
return UNZ_OK; return UNZ_OK;
} }
extern int DLL_EXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32) extern int MINIZIP_EXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
{ {
unz64_s* s; unz64_s* s;
if (file==NULL) if (file==NULL)
@@ -1121,7 +1121,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
No preparation of the structure is needed No preparation of the structure is needed
return UNZ_OK if there is no problem. return UNZ_OK if there is no problem.
*/ */
extern int DLL_EXPORT unzGetCurrentFileInfo64 (unzFile file, extern int MINIZIP_EXPORT unzGetCurrentFileInfo64 (unzFile file,
unz_file_info64 * pfile_info, unz_file_info64 * pfile_info,
char * szFileName, uLong fileNameBufferSize, char * szFileName, uLong fileNameBufferSize,
void *extraField, uLong extraFieldBufferSize, void *extraField, uLong extraFieldBufferSize,
@@ -1133,7 +1133,7 @@ extern int DLL_EXPORT unzGetCurrentFileInfo64 (unzFile file,
szComment,commentBufferSize); szComment,commentBufferSize);
} }
extern int DLL_EXPORT unzGetCurrentFileInfo (unzFile file, extern int MINIZIP_EXPORT unzGetCurrentFileInfo (unzFile file,
unz_file_info * pfile_info, unz_file_info * pfile_info,
char * szFileName, uLong fileNameBufferSize, char * szFileName, uLong fileNameBufferSize,
void *extraField, uLong extraFieldBufferSize, void *extraField, uLong extraFieldBufferSize,
@@ -1175,7 +1175,7 @@ extern int DLL_EXPORT unzGetCurrentFileInfo (unzFile file,
Set the current file of the zipfile to the first file. Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem return UNZ_OK if there is no problem
*/ */
extern int DLL_EXPORT unzGoToFirstFile (unzFile file) extern int MINIZIP_EXPORT unzGoToFirstFile (unzFile file)
{ {
int err=UNZ_OK; int err=UNZ_OK;
unz64_s* s; unz64_s* s;
@@ -1196,7 +1196,7 @@ extern int DLL_EXPORT unzGoToFirstFile (unzFile file)
return UNZ_OK if there is no problem return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/ */
extern int DLL_EXPORT unzGoToNextFile (unzFile file) extern int MINIZIP_EXPORT unzGoToNextFile (unzFile file)
{ {
unz64_s* s; unz64_s* s;
int err; int err;
@@ -1229,7 +1229,7 @@ extern int DLL_EXPORT unzGoToNextFile (unzFile file)
UNZ_OK if the file is found. It becomes the current file. UNZ_OK if the file is found. It becomes the current file.
UNZ_END_OF_LIST_OF_FILE if the file is not found UNZ_END_OF_LIST_OF_FILE if the file is not found
*/ */
extern int DLL_EXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity) extern int MINIZIP_EXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
{ {
unz64_s* s; unz64_s* s;
int err; int err;
@@ -1305,7 +1305,7 @@ typedef struct unz_file_pos_s
} unz_file_pos; } unz_file_pos;
*/ */
extern int DLL_EXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos) extern int MINIZIP_EXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos)
{ {
unz64_s* s; unz64_s* s;
@@ -1321,7 +1321,7 @@ extern int DLL_EXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos)
return UNZ_OK; return UNZ_OK;
} }
extern int DLL_EXPORT unzGetFilePos( extern int MINIZIP_EXPORT unzGetFilePos(
unzFile file, unzFile file,
unz_file_pos* file_pos) unz_file_pos* file_pos)
{ {
@@ -1335,7 +1335,7 @@ extern int DLL_EXPORT unzGetFilePos(
return err; return err;
} }
extern int DLL_EXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos) extern int MINIZIP_EXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
{ {
unz64_s* s; unz64_s* s;
int err; int err;
@@ -1357,7 +1357,7 @@ extern int DLL_EXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_
return err; return err;
} }
extern int DLL_EXPORT unzGoToFilePos( extern int MINIZIP_EXPORT unzGoToFilePos(
unzFile file, unzFile file,
unz_file_pos* file_pos) unz_file_pos* file_pos)
{ {
@@ -1469,7 +1469,7 @@ local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVa
Open for reading data the current file in the zipfile. Open for reading data the current file in the zipfile.
If there is no error and the file is opened, the return value is UNZ_OK. If there is no error and the file is opened, the return value is UNZ_OK.
*/ */
extern int DLL_EXPORT unzOpenCurrentFile3 (unzFile file, int* method, extern int MINIZIP_EXPORT unzOpenCurrentFile3 (unzFile file, int* method,
int* level, int raw, const char* password) int* level, int raw, const char* password)
{ {
int err=UNZ_OK; int err=UNZ_OK;
@@ -1638,24 +1638,24 @@ extern int DLL_EXPORT unzOpenCurrentFile3 (unzFile file, int* method,
return UNZ_OK; return UNZ_OK;
} }
extern int DLL_EXPORT unzOpenCurrentFile (unzFile file) extern int MINIZIP_EXPORT unzOpenCurrentFile (unzFile file)
{ {
return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
} }
extern int DLL_EXPORT unzOpenCurrentFilePassword (unzFile file, const char* password) extern int MINIZIP_EXPORT unzOpenCurrentFilePassword (unzFile file, const char* password)
{ {
return unzOpenCurrentFile3(file, NULL, NULL, 0, password); return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
} }
extern int DLL_EXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw) extern int MINIZIP_EXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
{ {
return unzOpenCurrentFile3(file, method, level, raw, NULL); return unzOpenCurrentFile3(file, method, level, raw, NULL);
} }
/** Addition for GDAL : START */ /** Addition for GDAL : START */
extern ZPOS64_T DLL_EXPORT unzGetCurrentFileZStreamPos64( unzFile file) extern ZPOS64_T MINIZIP_EXPORT unzGetCurrentFileZStreamPos64( unzFile file)
{ {
unz64_s* s; unz64_s* s;
file_in_zip64_read_info_s* pfile_in_zip_read_info; file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -1681,7 +1681,7 @@ extern ZPOS64_T DLL_EXPORT unzGetCurrentFileZStreamPos64( unzFile file)
return <0 with error code if there is an error return <0 with error code if there is an error
(UNZ_ERRNO for IO error, or zLib error for uncompress error) (UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/ */
extern int DLL_EXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) extern int MINIZIP_EXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len)
{ {
int err=UNZ_OK; int err=UNZ_OK;
uInt iRead = 0; uInt iRead = 0;
@@ -1886,7 +1886,7 @@ extern int DLL_EXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len
/* /*
Give the current position in uncompressed data Give the current position in uncompressed data
*/ */
extern z_off_t DLL_EXPORT unztell (unzFile file) extern z_off_t MINIZIP_EXPORT unztell (unzFile file)
{ {
unz64_s* s; unz64_s* s;
file_in_zip64_read_info_s* pfile_in_zip_read_info; file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -1901,7 +1901,7 @@ extern z_off_t DLL_EXPORT unztell (unzFile file)
return (z_off_t)pfile_in_zip_read_info->stream.total_out; return (z_off_t)pfile_in_zip_read_info->stream.total_out;
} }
extern ZPOS64_T DLL_EXPORT unztell64 (unzFile file) extern ZPOS64_T MINIZIP_EXPORT unztell64 (unzFile file)
{ {
unz64_s* s; unz64_s* s;
@@ -1921,7 +1921,7 @@ extern ZPOS64_T DLL_EXPORT unztell64 (unzFile file)
/* /*
return 1 if the end of file was reached, 0 elsewhere return 1 if the end of file was reached, 0 elsewhere
*/ */
extern int DLL_EXPORT unzeof (unzFile file) extern int MINIZIP_EXPORT unzeof (unzFile file)
{ {
unz64_s* s; unz64_s* s;
file_in_zip64_read_info_s* pfile_in_zip_read_info; file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -1953,7 +1953,7 @@ more info in the local-header version than in the central-header)
the return value is the number of bytes copied in buf, or (if <0) the return value is the number of bytes copied in buf, or (if <0)
the error code the error code
*/ */
extern int DLL_EXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len) extern int MINIZIP_EXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
{ {
unz64_s* s; unz64_s* s;
file_in_zip64_read_info_s* pfile_in_zip_read_info; file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -2001,7 +2001,7 @@ extern int DLL_EXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned l
Close the file in zip opened with unzOpenCurrentFile Close the file in zip opened with unzOpenCurrentFile
Return UNZ_CRCERROR if all the file was read but the CRC is not good Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/ */
extern int DLL_EXPORT unzCloseCurrentFile (unzFile file) extern int MINIZIP_EXPORT unzCloseCurrentFile (unzFile file)
{ {
int err=UNZ_OK; int err=UNZ_OK;
@@ -2048,7 +2048,7 @@ extern int DLL_EXPORT unzCloseCurrentFile (unzFile file)
uSizeBuf is the size of the szComment buffer. uSizeBuf is the size of the szComment buffer.
return the number of byte copied or an error code <0 return the number of byte copied or an error code <0
*/ */
extern int DLL_EXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf) extern int MINIZIP_EXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
{ {
unz64_s* s; unz64_s* s;
uLong uReadThis ; uLong uReadThis ;
@@ -2076,7 +2076,7 @@ extern int DLL_EXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong
} }
/* Additions by RX '2004 */ /* Additions by RX '2004 */
extern ZPOS64_T DLL_EXPORT unzGetOffset64(unzFile file) extern ZPOS64_T MINIZIP_EXPORT unzGetOffset64(unzFile file)
{ {
unz64_s* s; unz64_s* s;
@@ -2091,7 +2091,7 @@ extern ZPOS64_T DLL_EXPORT unzGetOffset64(unzFile file)
return s->pos_in_central_dir; return s->pos_in_central_dir;
} }
extern uLong DLL_EXPORT unzGetOffset (unzFile file) extern uLong MINIZIP_EXPORT unzGetOffset (unzFile file)
{ {
ZPOS64_T offset64; ZPOS64_T offset64;
@@ -2101,7 +2101,7 @@ extern uLong DLL_EXPORT unzGetOffset (unzFile file)
return (uLong)offset64; return (uLong)offset64;
} }
extern int DLL_EXPORT unzSetOffset64(unzFile file, ZPOS64_T pos) extern int MINIZIP_EXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
{ {
unz64_s* s; unz64_s* s;
int err; int err;
@@ -2119,7 +2119,7 @@ extern int DLL_EXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
return err; return err;
} }
extern int DLL_EXPORT unzSetOffset (unzFile file, uLong pos) extern int MINIZIP_EXPORT unzSetOffset (unzFile file, uLong pos)
{ {
return unzSetOffset64(file,pos); return unzSetOffset64(file,pos);
} }

66
lib/minizip/unzip.h
View File

@@ -150,7 +150,7 @@ typedef struct unz_file_info_s
tm_unz tmu_date; tm_unz tmu_date;
} unz_file_info; } unz_file_info;
extern int DLL_EXPORT unzStringFileNameCompare OF ((const char* fileName1, extern int MINIZIP_EXPORT unzStringFileNameCompare OF ((const char* fileName1,
const char* fileName2, const char* fileName2,
int iCaseSensitivity)); int iCaseSensitivity));
/* /*
@@ -163,8 +163,8 @@ extern int DLL_EXPORT unzStringFileNameCompare OF ((const char* fileName1,
*/ */
extern unzFile DLL_EXPORT unzOpen OF((const char *path)); extern unzFile MINIZIP_EXPORT unzOpen OF((const char *path));
extern unzFile DLL_EXPORT unzOpen64 OF((const void *path)); extern unzFile MINIZIP_EXPORT unzOpen64 OF((const void *path));
/* /*
Open a Zip file. path contain the full pathname (by example, Open a Zip file. path contain the full pathname (by example,
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
@@ -181,31 +181,31 @@ extern unzFile DLL_EXPORT unzOpen64 OF((const void *path));
*/ */
extern unzFile DLL_EXPORT unzOpen2 OF((const char *path, extern unzFile MINIZIP_EXPORT unzOpen2 OF((const char *path,
zlib_filefunc_def* pzlib_filefunc_def)); zlib_filefunc_def* pzlib_filefunc_def));
/* /*
Open a Zip file, like unzOpen, but provide a set of file low level API Open a Zip file, like unzOpen, but provide a set of file low level API
for read/write the zip file (see ioapi.h) for read/write the zip file (see ioapi.h)
*/ */
extern unzFile DLL_EXPORT unzOpen2_64 OF((const void *path, extern unzFile MINIZIP_EXPORT unzOpen2_64 OF((const void *path,
zlib_filefunc64_def* pzlib_filefunc_def)); zlib_filefunc64_def* pzlib_filefunc_def));
/* /*
Open a Zip file, like unz64Open, but provide a set of file low level API Open a Zip file, like unz64Open, but provide a set of file low level API
for read/write the zip file (see ioapi.h) for read/write the zip file (see ioapi.h)
*/ */
extern int DLL_EXPORT unzClose OF((unzFile file)); extern int MINIZIP_EXPORT unzClose OF((unzFile file));
/* /*
Close a ZipFile opened with unzOpen. Close a ZipFile opened with unzOpen.
If there is files inside the .Zip opened with unzOpenCurrentFile (see later), If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
these files MUST be closed with unzCloseCurrentFile before call unzClose. these files MUST be closed with unzCloseCurrentFile before call unzClose.
return UNZ_OK if there is no problem. */ return UNZ_OK if there is no problem. */
extern int DLL_EXPORT unzGetGlobalInfo OF((unzFile file, extern int MINIZIP_EXPORT unzGetGlobalInfo OF((unzFile file,
unz_global_info *pglobal_info)); unz_global_info *pglobal_info));
extern int DLL_EXPORT unzGetGlobalInfo64 OF((unzFile file, extern int MINIZIP_EXPORT unzGetGlobalInfo64 OF((unzFile file,
unz_global_info64 *pglobal_info)); unz_global_info64 *pglobal_info));
/* /*
Write info about the ZipFile in the *pglobal_info structure. Write info about the ZipFile in the *pglobal_info structure.
@@ -213,7 +213,7 @@ extern int DLL_EXPORT unzGetGlobalInfo64 OF((unzFile file,
return UNZ_OK if there is no problem. */ return UNZ_OK if there is no problem. */
extern int DLL_EXPORT unzGetGlobalComment OF((unzFile file, extern int MINIZIP_EXPORT unzGetGlobalComment OF((unzFile file,
char *szComment, char *szComment,
uLong uSizeBuf)); uLong uSizeBuf));
/* /*
@@ -226,20 +226,20 @@ extern int DLL_EXPORT unzGetGlobalComment OF((unzFile file,
/***************************************************************************/ /***************************************************************************/
/* Unzip package allow you browse the directory of the zipfile */ /* Unzip package allow you browse the directory of the zipfile */
extern int DLL_EXPORT unzGoToFirstFile OF((unzFile file)); extern int MINIZIP_EXPORT unzGoToFirstFile OF((unzFile file));
/* /*
Set the current file of the zipfile to the first file. Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem return UNZ_OK if there is no problem
*/ */
extern int DLL_EXPORT unzGoToNextFile OF((unzFile file)); extern int MINIZIP_EXPORT unzGoToNextFile OF((unzFile file));
/* /*
Set the current file of the zipfile to the next file. Set the current file of the zipfile to the next file.
return UNZ_OK if there is no problem return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/ */
extern int DLL_EXPORT unzLocateFile OF((unzFile file, extern int MINIZIP_EXPORT unzLocateFile OF((unzFile file,
const char *szFileName, const char *szFileName,
int iCaseSensitivity)); int iCaseSensitivity));
/* /*
@@ -261,11 +261,11 @@ typedef struct unz_file_pos_s
uLong num_of_file; /* # of file */ uLong num_of_file; /* # of file */
} unz_file_pos; } unz_file_pos;
extern int DLL_EXPORT unzGetFilePos( extern int MINIZIP_EXPORT unzGetFilePos(
unzFile file, unzFile file,
unz_file_pos* file_pos); unz_file_pos* file_pos);
extern int DLL_EXPORT unzGoToFilePos( extern int MINIZIP_EXPORT unzGoToFilePos(
unzFile file, unzFile file,
unz_file_pos* file_pos); unz_file_pos* file_pos);
@@ -275,17 +275,17 @@ typedef struct unz64_file_pos_s
ZPOS64_T num_of_file; /* # of file */ ZPOS64_T num_of_file; /* # of file */
} unz64_file_pos; } unz64_file_pos;
extern int DLL_EXPORT unzGetFilePos64( extern int MINIZIP_EXPORT unzGetFilePos64(
unzFile file, unzFile file,
unz64_file_pos* file_pos); unz64_file_pos* file_pos);
extern int DLL_EXPORT unzGoToFilePos64( extern int MINIZIP_EXPORT unzGoToFilePos64(
unzFile file, unzFile file,
const unz64_file_pos* file_pos); const unz64_file_pos* file_pos);
/* ****************************************** */ /* ****************************************** */
extern int DLL_EXPORT unzGetCurrentFileInfo64 OF((unzFile file, extern int MINIZIP_EXPORT unzGetCurrentFileInfo64 OF((unzFile file,
unz_file_info64 *pfile_info, unz_file_info64 *pfile_info,
char *szFileName, char *szFileName,
uLong fileNameBufferSize, uLong fileNameBufferSize,
@@ -294,7 +294,7 @@ extern int DLL_EXPORT unzGetCurrentFileInfo64 OF((unzFile file,
char *szComment, char *szComment,
uLong commentBufferSize)); uLong commentBufferSize));
extern int DLL_EXPORT unzGetCurrentFileInfo OF((unzFile file, extern int MINIZIP_EXPORT unzGetCurrentFileInfo OF((unzFile file,
unz_file_info *pfile_info, unz_file_info *pfile_info,
char *szFileName, char *szFileName,
uLong fileNameBufferSize, uLong fileNameBufferSize,
@@ -318,7 +318,7 @@ extern int DLL_EXPORT unzGetCurrentFileInfo OF((unzFile file,
/** Addition for GDAL : START */ /** Addition for GDAL : START */
extern ZPOS64_T DLL_EXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file)); extern ZPOS64_T MINIZIP_EXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
/** Addition for GDAL : END */ /** Addition for GDAL : END */
@@ -328,13 +328,13 @@ extern ZPOS64_T DLL_EXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
from it, and close it (you can close it before reading all the file) from it, and close it (you can close it before reading all the file)
*/ */
extern int DLL_EXPORT unzOpenCurrentFile OF((unzFile file)); extern int MINIZIP_EXPORT unzOpenCurrentFile OF((unzFile file));
/* /*
Open for reading data the current file in the zipfile. Open for reading data the current file in the zipfile.
If there is no error, the return value is UNZ_OK. If there is no error, the return value is UNZ_OK.
*/ */
extern int DLL_EXPORT unzOpenCurrentFilePassword OF((unzFile file, extern int MINIZIP_EXPORT unzOpenCurrentFilePassword OF((unzFile file,
const char* password)); const char* password));
/* /*
Open for reading data the current file in the zipfile. Open for reading data the current file in the zipfile.
@@ -342,7 +342,7 @@ extern int DLL_EXPORT unzOpenCurrentFilePassword OF((unzFile file,
If there is no error, the return value is UNZ_OK. If there is no error, the return value is UNZ_OK.
*/ */
extern int DLL_EXPORT unzOpenCurrentFile2 OF((unzFile file, extern int MINIZIP_EXPORT unzOpenCurrentFile2 OF((unzFile file,
int* method, int* method,
int* level, int* level,
int raw)); int raw));
@@ -355,7 +355,7 @@ extern int DLL_EXPORT unzOpenCurrentFile2 OF((unzFile file,
but you CANNOT set method parameter as NULL but you CANNOT set method parameter as NULL
*/ */
extern int DLL_EXPORT unzOpenCurrentFile3 OF((unzFile file, extern int MINIZIP_EXPORT unzOpenCurrentFile3 OF((unzFile file,
int* method, int* method,
int* level, int* level,
int raw, int raw,
@@ -370,13 +370,13 @@ extern int DLL_EXPORT unzOpenCurrentFile3 OF((unzFile file,
*/ */
extern int DLL_EXPORT unzCloseCurrentFile OF((unzFile file)); extern int MINIZIP_EXPORT unzCloseCurrentFile OF((unzFile file));
/* /*
Close the file in zip opened with unzOpenCurrentFile Close the file in zip opened with unzOpenCurrentFile
Return UNZ_CRCERROR if all the file was read but the CRC is not good Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/ */
extern int DLL_EXPORT unzReadCurrentFile OF((unzFile file, extern int MINIZIP_EXPORT unzReadCurrentFile OF((unzFile file,
voidp buf, voidp buf,
unsigned len)); unsigned len));
/* /*
@@ -390,19 +390,19 @@ extern int DLL_EXPORT unzReadCurrentFile OF((unzFile file,
(UNZ_ERRNO for IO error, or zLib error for uncompress error) (UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/ */
extern z_off_t DLL_EXPORT unztell OF((unzFile file)); extern z_off_t MINIZIP_EXPORT unztell OF((unzFile file));
extern ZPOS64_T DLL_EXPORT unztell64 OF((unzFile file)); extern ZPOS64_T MINIZIP_EXPORT unztell64 OF((unzFile file));
/* /*
Give the current position in uncompressed data Give the current position in uncompressed data
*/ */
extern int DLL_EXPORT unzeof OF((unzFile file)); extern int MINIZIP_EXPORT unzeof OF((unzFile file));
/* /*
return 1 if the end of file was reached, 0 elsewhere return 1 if the end of file was reached, 0 elsewhere
*/ */
extern int DLL_EXPORT unzGetLocalExtrafield OF((unzFile file, extern int MINIZIP_EXPORT unzGetLocalExtrafield OF((unzFile file,
voidp buf, voidp buf,
unsigned len)); unsigned len));
/* /*
@@ -421,12 +421,12 @@ extern int DLL_EXPORT unzGetLocalExtrafield OF((unzFile file,
/***************************************************************************/ /***************************************************************************/
/* Get the current file offset */ /* Get the current file offset */
extern ZPOS64_T DLL_EXPORT unzGetOffset64 (unzFile file); extern ZPOS64_T MINIZIP_EXPORT unzGetOffset64 (unzFile file);
extern uLong DLL_EXPORT unzGetOffset (unzFile file); extern uLong MINIZIP_EXPORT unzGetOffset (unzFile file);
/* Set the current file offset */ /* Set the current file offset */
extern int DLL_EXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos); extern int MINIZIP_EXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
extern int DLL_EXPORT unzSetOffset (unzFile file, uLong pos); extern int MINIZIP_EXPORT unzSetOffset (unzFile file, uLong pos);

38
lib/minizip/zip.c
View File

@@ -851,7 +851,7 @@ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
/************************************************************/ /************************************************************/
extern zipFile DLL_EXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def) extern zipFile MINIZIP_EXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
{ {
zip64_internal ziinit; zip64_internal ziinit;
zip64_internal* zi; zip64_internal* zi;
@@ -922,7 +922,7 @@ extern zipFile DLL_EXPORT zipOpen3 (const void *pathname, int append, zipcharpc*
} }
} }
extern zipFile DLL_EXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def) extern zipFile MINIZIP_EXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
{ {
if (pzlib_filefunc32_def != NULL) if (pzlib_filefunc32_def != NULL)
{ {
@@ -934,7 +934,7 @@ extern zipFile DLL_EXPORT zipOpen2 (const char *pathname, int append, zipcharpc*
return zipOpen3(pathname, append, globalcomment, NULL); return zipOpen3(pathname, append, globalcomment, NULL);
} }
extern zipFile DLL_EXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def) extern zipFile MINIZIP_EXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
{ {
if (pzlib_filefunc_def != NULL) if (pzlib_filefunc_def != NULL)
{ {
@@ -950,12 +950,12 @@ extern zipFile DLL_EXPORT zipOpen2_64 (const void *pathname, int append, zipchar
extern zipFile DLL_EXPORT zipOpen (const char* pathname, int append) extern zipFile MINIZIP_EXPORT zipOpen (const char* pathname, int append)
{ {
return zipOpen3((const void*)pathname,append,NULL,NULL); return zipOpen3((const void*)pathname,append,NULL,NULL);
} }
extern zipFile DLL_EXPORT zipOpen64 (const void* pathname, int append) extern zipFile MINIZIP_EXPORT zipOpen64 (const void* pathname, int append)
{ {
return zipOpen3(pathname,append,NULL,NULL); return zipOpen3(pathname,append,NULL,NULL);
} }
@@ -1057,7 +1057,7 @@ int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_ex
It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
unnecessary allocations. unnecessary allocations.
*/ */
extern int DLL_EXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw, const char* comment, int method, int level, int raw,
@@ -1267,7 +1267,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filenam
return err; return err;
} }
extern int DLL_EXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw, const char* comment, int method, int level, int raw,
@@ -1283,7 +1283,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename,
password, crcForCrypting, versionMadeBy, flagBase, 0); password, crcForCrypting, versionMadeBy, flagBase, 0);
} }
extern int DLL_EXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw, const char* comment, int method, int level, int raw,
@@ -1298,7 +1298,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename,
password, crcForCrypting, VERSIONMADEBY, 0, 0); password, crcForCrypting, VERSIONMADEBY, 0, 0);
} }
extern int DLL_EXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw, const char* comment, int method, int level, int raw,
@@ -1313,7 +1313,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename
password, crcForCrypting, VERSIONMADEBY, 0, zip64); password, crcForCrypting, VERSIONMADEBY, 0, zip64);
} }
extern int DLL_EXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw) const char* comment, int method, int level, int raw)
@@ -1326,7 +1326,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, c
NULL, 0, VERSIONMADEBY, 0, 0); NULL, 0, VERSIONMADEBY, 0, 0);
} }
extern int DLL_EXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, uInt size_extrafield_global, const void* extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int raw, int zip64) const char* comment, int method, int level, int raw, int zip64)
@@ -1339,7 +1339,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename
NULL, 0, VERSIONMADEBY, 0, zip64); NULL, 0, VERSIONMADEBY, 0, zip64);
} }
extern int DLL_EXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void*extrafield_global, uInt size_extrafield_global, const void*extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level, int zip64) const char* comment, int method, int level, int zip64)
@@ -1352,7 +1352,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename,
NULL, 0, VERSIONMADEBY, 0, zip64); NULL, 0, VERSIONMADEBY, 0, zip64);
} }
extern int DLL_EXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi, extern int MINIZIP_EXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
const void* extrafield_local, uInt size_extrafield_local, const void* extrafield_local, uInt size_extrafield_local,
const void*extrafield_global, uInt size_extrafield_global, const void*extrafield_global, uInt size_extrafield_global,
const char* comment, int method, int level) const char* comment, int method, int level)
@@ -1404,7 +1404,7 @@ local int zip64FlushWriteBuffer(zip64_internal* zi)
return err; return err;
} }
extern int DLL_EXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len) extern int MINIZIP_EXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
{ {
zip64_internal* zi; zip64_internal* zi;
int err=ZIP_OK; int err=ZIP_OK;
@@ -1511,12 +1511,12 @@ extern int DLL_EXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned
return err; return err;
} }
extern int DLL_EXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32) extern int MINIZIP_EXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
{ {
return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32); return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
} }
extern int DLL_EXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32) extern int MINIZIP_EXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
{ {
zip64_internal* zi; zip64_internal* zi;
ZPOS64_T compressed_size; ZPOS64_T compressed_size;
@@ -1752,7 +1752,7 @@ extern int DLL_EXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompresse
return err; return err;
} }
extern int DLL_EXPORT zipCloseFileInZip (zipFile file) extern int MINIZIP_EXPORT zipCloseFileInZip (zipFile file)
{ {
return zipCloseFileInZipRaw (file,0,0); return zipCloseFileInZipRaw (file,0,0);
} }
@@ -1884,7 +1884,7 @@ int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
return err; return err;
} }
extern int DLL_EXPORT zipClose (zipFile file, const char* global_comment) extern int MINIZIP_EXPORT zipClose (zipFile file, const char* global_comment)
{ {
zip64_internal* zi; zip64_internal* zi;
int err = 0; int err = 0;
@@ -1953,7 +1953,7 @@ extern int DLL_EXPORT zipClose (zipFile file, const char* global_comment)
return err; return err;
} }
extern int DLL_EXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader) extern int MINIZIP_EXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
{ {
char* p = pData; char* p = pData;
int size = 0; int size = 0;

36
lib/minizip/zip.h
View File

@@ -113,8 +113,8 @@ typedef const char* zipcharpc;
#define APPEND_STATUS_CREATEAFTER (1) #define APPEND_STATUS_CREATEAFTER (1)
#define APPEND_STATUS_ADDINZIP (2) #define APPEND_STATUS_ADDINZIP (2)
extern zipFile DLL_EXPORT zipOpen OF((const char *pathname, int append)); extern zipFile MINIZIP_EXPORT zipOpen OF((const char *pathname, int append));
extern zipFile DLL_EXPORT zipOpen64 OF((const void *pathname, int append)); extern zipFile MINIZIP_EXPORT zipOpen64 OF((const void *pathname, int append));
/* /*
Create a zipfile. Create a zipfile.
pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
@@ -134,17 +134,17 @@ extern zipFile DLL_EXPORT zipOpen64 OF((const void *pathname, int append));
Of couse, you can use RAW reading and writing to copy the file you did not want delte Of couse, you can use RAW reading and writing to copy the file you did not want delte
*/ */
extern zipFile DLL_EXPORT zipOpen2 OF((const char *pathname, extern zipFile MINIZIP_EXPORT zipOpen2 OF((const char *pathname,
int append, int append,
zipcharpc* globalcomment, zipcharpc* globalcomment,
zlib_filefunc_def* pzlib_filefunc_def)); zlib_filefunc_def* pzlib_filefunc_def));
extern zipFile DLL_EXPORT zipOpen2_64 OF((const void *pathname, extern zipFile MINIZIP_EXPORT zipOpen2_64 OF((const void *pathname,
int append, int append,
zipcharpc* globalcomment, zipcharpc* globalcomment,
zlib_filefunc64_def* pzlib_filefunc_def)); zlib_filefunc64_def* pzlib_filefunc_def));
extern int DLL_EXPORT zipOpenNewFileInZip OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -155,7 +155,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip OF((zipFile file,
int method, int method,
int level)); int level));
extern int DLL_EXPORT zipOpenNewFileInZip64 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip64 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -184,7 +184,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip64 OF((zipFile file,
*/ */
extern int DLL_EXPORT zipOpenNewFileInZip2 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip2 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -197,7 +197,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip2 OF((zipFile file,
int raw)); int raw));
extern int DLL_EXPORT zipOpenNewFileInZip2_64 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -213,7 +213,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
Same than zipOpenNewFileInZip, except if raw=1, we write raw file Same than zipOpenNewFileInZip, except if raw=1, we write raw file
*/ */
extern int DLL_EXPORT zipOpenNewFileInZip3 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip3 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -230,7 +230,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip3 OF((zipFile file,
const char* password, const char* password,
uLong crcForCrypting)); uLong crcForCrypting));
extern int DLL_EXPORT zipOpenNewFileInZip3_64 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -256,7 +256,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
crcForCrypting : crc of file to compress (needed for crypting) crcForCrypting : crc of file to compress (needed for crypting)
*/ */
extern int DLL_EXPORT zipOpenNewFileInZip4 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip4 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -277,7 +277,7 @@ extern int DLL_EXPORT zipOpenNewFileInZip4 OF((zipFile file,
)); ));
extern int DLL_EXPORT zipOpenNewFileInZip4_64 OF((zipFile file, extern int MINIZIP_EXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
@@ -304,23 +304,23 @@ extern int DLL_EXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
*/ */
extern int DLL_EXPORT zipWriteInFileInZip OF((zipFile file, extern int MINIZIP_EXPORT zipWriteInFileInZip OF((zipFile file,
const void* buf, const void* buf,
unsigned len)); unsigned len));
/* /*
Write data in the zipfile Write data in the zipfile
*/ */
extern int DLL_EXPORT zipCloseFileInZip OF((zipFile file)); extern int MINIZIP_EXPORT zipCloseFileInZip OF((zipFile file));
/* /*
Close the current file in the zipfile Close the current file in the zipfile
*/ */
extern int DLL_EXPORT zipCloseFileInZipRaw OF((zipFile file, extern int MINIZIP_EXPORT zipCloseFileInZipRaw OF((zipFile file,
uLong uncompressed_size, uLong uncompressed_size,
uLong crc32)); uLong crc32));
extern int DLL_EXPORT zipCloseFileInZipRaw64 OF((zipFile file, extern int MINIZIP_EXPORT zipCloseFileInZipRaw64 OF((zipFile file,
ZPOS64_T uncompressed_size, ZPOS64_T uncompressed_size,
uLong crc32)); uLong crc32));
@@ -330,14 +330,14 @@ extern int DLL_EXPORT zipCloseFileInZipRaw64 OF((zipFile file,
uncompressed_size and crc32 are value for the uncompressed size uncompressed_size and crc32 are value for the uncompressed size
*/ */
extern int DLL_EXPORT zipClose OF((zipFile file, extern int MINIZIP_EXPORT zipClose OF((zipFile file,
const char* global_comment)); const char* global_comment));
/* /*
Close the zipfile Close the zipfile
*/ */
extern int DLL_EXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader)); extern int MINIZIP_EXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
/* /*
zipRemoveExtraInfoBlock - Added by Mathias Svensson zipRemoveExtraInfoBlock - Added by Mathias Svensson