c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed includes.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2017-10-04 22:10:11 -07:00
parent b436625e4e
commit 41cfdcb45f
21 changed files with 147 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniunz.c
View File

@ -22,9 +22,8 @@
#include <time.h>
#include <errno.h>
#include "mzstrm.h"
#include "unzip.h"
#include "mz_strm.h"
#include "mz_unzip.h"
/***************************************************************************/

5
minizip.c
View File

@ -22,9 +22,8 @@
#include <time.h>
#include <errno.h>
#include "zip.h"
#include "mzstrm.h"
#include "mz_zip.h"
#include "mz_strm.h"
/***************************************************************************/

4
mz_compat.c
View File

@ -17,8 +17,8 @@
#include <stdint.h>
#include <string.h>
#include "zip.h"
#include "unzip.h"
#include "mz_zip.h"
#include "mz_unzip.h"
#include "mz_compat.h"

2
mz_strm.c
View File

@ -19,7 +19,7 @@
#include <time.h>
#include "mzstrm.h"
#include "mz_strm.h"
/***************************************************************************/

4
mz_strm.h
View File

@ -115,7 +115,7 @@ void mz_stream_passthru_delete(void **stream);
/***************************************************************************/
#if !defined(_WIN32) && !defined(USEWIN32IOAPI)
#include "mzstrm_posix.h"
#include "mz_strm_posix.h"
#define mz_stream_os_open mz_stream_posix_open
#define mz_stream_os_is_open mz_stream_posix_is_open
@ -135,7 +135,7 @@ void mz_stream_passthru_delete(void **stream);
#define mz_os_change_dir mz_posix_change_dir
#define mz_os_make_dir mz_posix_make_dir
#else
#include "mzstrm_win32.h"
#include "mz_strm_win32.h"
#define mz_stream_os_open mz_stream_win32_open
#define mz_stream_os_is_open mz_stream_win32_is_open

4
mz_strm_aes.c
View File

@ -12,8 +12,8 @@
#include <stdlib.h>
#include <string.h>
#include "mzstrm.h"
#include "mzstrm_aes.h"
#include "mz_strm.h"
#include "mz_strm_aes.h"
#include "aes/aes.h"
#include "aes/fileenc.h"

4
mz_strm_buf.c
View File

@ -16,8 +16,8 @@
#include <string.h>
#include <stdarg.h>
#include "mzstrm.h"
#include "mzstrm_buf.h"
#include "mz_strm.h"
#include "mz_strm_buf.h"
/***************************************************************************/

4
mz_strm_bzip.c
View File

@ -16,8 +16,8 @@
#include "bzip2\bzlib.h"
#include "mzstrm.h"
#include "mzstrm_bzip.h"
#include "mz_strm.h"
#include "mz_strm_bzip.h"
/***************************************************************************/

4
mz_strm_crypt.c
View File

@ -31,8 +31,8 @@
#include "zlib.h"
#include "mzstrm.h"
#include "mzstrm_crypt.h"
#include "mz_strm.h"
#include "mz_strm_crypt.h"
/***************************************************************************/

4
mz_strm_lzma.c
View File

@ -17,8 +17,8 @@
#include <lzma.h>
#include "mzstrm.h"
#include "mzstrm_lzma.h"
#include "mz_strm.h"
#include "mz_strm_lzma.h"
/***************************************************************************/

4
mz_strm_mem.c
View File

@ -20,8 +20,8 @@
#include <stdlib.h>
#include <string.h>
#include "mzstrm.h"
#include "mzstrm_mem.h"
#include "mz_strm.h"
#include "mz_strm_mem.h"
/***************************************************************************/

4
mz_strm_posix.c
View File

@ -35,8 +35,8 @@
# define mkdir(x,y) _mkdir(x)
#endif
#include "mzstrm.h"
#include "mzstrm_posix.h"
#include "mz_strm.h"
#include "mz_strm_posix.h"
/***************************************************************************/

4
mz_strm_win32.c
View File

@ -19,8 +19,8 @@
#include <windows.h>
#include <wincrypt.h>
#include "mzstrm.h"
#include "mzstrm_win32.h"
#include "mz_strm.h"
#include "mz_strm_win32.h"
/***************************************************************************/

4
mz_strm_zlib.c
View File

@ -16,8 +16,8 @@
#include "zlib.h"
#include "mzstrm.h"
#include "mzstrm_zlib.h"
#include "mz_strm.h"
#include "mz_strm_zlib.h"
/***************************************************************************/

16
mz_unzip.c
View File

@ -25,23 +25,23 @@
#include "zlib.h"
#include "mzstrm.h"
#include "mz_strm.h"
#ifdef HAVE_AES
#include "mzstrm_aes.h"
#include "mz_strm_aes.h"
#endif
#ifdef HAVE_BZIP2
#include "mzstrm_bzip.h"
#include "mz_strm_bzip.h"
#endif
#ifndef NOUNCRYPT
# include "mzstrm_crypt.h"
# include "mz_strm_crypt.h"
#endif
#ifdef HAVE_LZMA
#include "mzstrm_lzma.h"
#include "mz_strm_lzma.h"
#endif
#include "mzstrm_mem.h"
#include "mzstrm_zlib.h"
#include "mz_strm_mem.h"
#include "mz_strm_zlib.h"
#include "unzip.h"
#include "mz_unzip.h"
/***************************************************************************/

2
mz_unzip.h
View File

@ -28,7 +28,7 @@ extern "C" {
#endif
#ifndef _ZLIBIOAPI_H
#include "mzstrm.h"
#include "mz_strm.h"
#endif
/***************************************************************************/

16
mz_zip.c
View File

@ -23,23 +23,23 @@
#include "zlib.h"
#include "mzstrm.h"
#include "mz_strm.h"
#ifdef HAVE_AES
# include "mzstrm_aes.h"
# include "mz_strm_aes.h"
#endif
#ifdef HAVE_BZIP2
# include "mzstrm_bzip.h"
# include "mz_strm_bzip.h"
#endif
#ifndef NOCRYPT
# include "mzstrm_crypt.h"
# include "mz_strm_crypt.h"
#endif
#ifdef HAVE_LZMA
# include "mzstrm_lzma.h"
# include "mz_strm_lzma.h"
#endif
#include "mzstrm_mem.h"
#include "mzstrm_zlib.h"
#include "mz_strm_mem.h"
#include "mz_strm_zlib.h"
#include "zip.h"
#include "mz_zip.h"
/***************************************************************************/

2
mz_zip.h
View File

@ -26,7 +26,7 @@ extern "C" {
#endif
#ifndef _ZLIBIOAPI_H
# include "mzstrm.h"
# include "mz_strm.h"
#endif
/***************************************************************************/

10
test.c
View File

@ -5,11 +5,11 @@
#include <errno.h>
#include <fcntl.h>
#include "mzstrm.h"
#include "mzstrm_bzip.h"
#include "mzstrm_crypt.h"
#include "mzstrm_aes.h"
#include "mzstrm_zlib.h"
#include "mz_strm.h"
#include "mz_strm_bzip.h"
#include "mz_strm_crypt.h"
#include "mz_strm_aes.h"
#include "mz_strm_zlib.h"
void test_encrypt(char *method, mz_stream_create_cb crypt_create, char *password)
{

48
windows/libminizip.vcxproj
View File

@ -133,16 +133,6 @@
<ClCompile Include="..\lib\bzip2\compress.c" />
<ClCompile Include="..\lib\bzip2\crctable.c" />
<ClCompile Include="..\lib\bzip2\decompress.c" />
<ClCompile Include="..\mzstrm.c" />
<ClCompile Include="..\mzstrm_aes.c" />
<ClCompile Include="..\mzstrm_buf.c" />
<ClCompile Include="..\mzstrm_bzip.c" />
<ClCompile Include="..\mzstrm_crypt.c" />
<ClCompile Include="..\mzstrm_lzma.c" />
<ClCompile Include="..\mzstrm_mem.c" />
<ClCompile Include="..\mzstrm_posix.c" />
<ClCompile Include="..\mzstrm_zlib.c" />
<ClCompile Include="..\mzstrm_win32.c" />
<ClCompile Include="..\lib\aes\aescrypt.c" />
<ClCompile Include="..\lib\aes\aeskey.c" />
<ClCompile Include="..\lib\aes\aestab.c" />
@ -155,9 +145,19 @@
<ClCompile Include="..\lib\bzip2\huffman.c" />
<ClCompile Include="..\lib\bzip2\randtable.c" />
<ClCompile Include="..\mz_compat.c" />
<ClCompile Include="..\mz_strm.c" />
<ClCompile Include="..\mz_strm_aes.c" />
<ClCompile Include="..\mz_strm_buf.c" />
<ClCompile Include="..\mz_strm_bzip.c" />
<ClCompile Include="..\mz_strm_crypt.c" />
<ClCompile Include="..\mz_strm_lzma.c" />
<ClCompile Include="..\mz_strm_mem.c" />
<ClCompile Include="..\mz_strm_posix.c" />
<ClCompile Include="..\mz_strm_win32.c" />
<ClCompile Include="..\mz_strm_zlib.c" />
<ClCompile Include="..\mz_unzip.c" />
<ClCompile Include="..\mz_zip.c" />
<ClCompile Include="..\test.c" />
<ClCompile Include="..\unzip.c" />
<ClCompile Include="..\zip.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\crc32.h" />
@ -171,16 +171,6 @@
<ClInclude Include="..\..\..\zlib.h" />
<ClInclude Include="..\..\..\zutil.h" />
<ClInclude Include="..\lib\bzip2\bzlib_private.h" />
<ClInclude Include="..\mzstrm.h" />
<ClInclude Include="..\mzstrm_aes.h" />
<ClInclude Include="..\mzstrm_buf.h" />
<ClInclude Include="..\mzstrm_bzip.h" />
<ClInclude Include="..\mzstrm_crypt.h" />
<ClInclude Include="..\mzstrm_lzma.h" />
<ClInclude Include="..\mzstrm_mem.h" />
<ClInclude Include="..\mzstrm_posix.h" />
<ClInclude Include="..\mzstrm_zlib.h" />
<ClInclude Include="..\mzstrm_win32.h" />
<ClInclude Include="..\lib\aes\aes.h" />
<ClInclude Include="..\lib\aes\aesopt.h" />
<ClInclude Include="..\lib\aes\aestab.h" />
@ -193,9 +183,19 @@
<ClInclude Include="..\lib\aes\sha1.h" />
<ClInclude Include="..\lib\bzip2\bzlib.h" />
<ClInclude Include="..\mz_compat.h" />
<ClInclude Include="..\mz_strm.h" />
<ClInclude Include="..\mz_strm_aes.h" />
<ClInclude Include="..\mz_strm_buf.h" />
<ClInclude Include="..\mz_strm_bzip.h" />
<ClInclude Include="..\mz_strm_crypt.h" />
<ClInclude Include="..\mz_strm_lzma.h" />
<ClInclude Include="..\mz_strm_mem.h" />
<ClInclude Include="..\mz_strm_posix.h" />
<ClInclude Include="..\mz_strm_win32.h" />
<ClInclude Include="..\mz_strm_zlib.h" />
<ClInclude Include="..\mz_unzip.h" />
<ClInclude Include="..\mz_zip.h" />
<ClInclude Include="..\test.h" />
<ClInclude Include="..\unzip.h" />
<ClInclude Include="..\zip.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="liblzma.vcxproj">

146
windows/libminizip.vcxproj.filters
View File

@ -20,9 +20,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\unzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\zutil.c">
<Filter>Zlib</Filter>
</ClCompile>
@ -56,9 +53,6 @@
<ClCompile Include="..\..\..\uncompr.c">
<Filter>Zlib</Filter>
</ClCompile>
<ClCompile Include="..\zip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\lib\aes\aes_ni.c">
<Filter>AES</Filter>
</ClCompile>
@ -92,62 +86,65 @@
<ClCompile Include="..\lib\bzip2\randtable.c">
<Filter>BZip</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_aes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_buf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_crypt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_mem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_posix.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_zlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\lib\bzip2\bzlib.c">
<Filter>BZip</Filter>
</ClCompile>
<ClCompile Include="..\mz_compat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\test.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_bzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\lib\bzip2\crctable.c">
<Filter>BZip</Filter>
</ClCompile>
<ClCompile Include="..\mzstrm_lzma.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\lib\bzip2\compress.c">
<Filter>BZip</Filter>
</ClCompile>
<ClCompile Include="..\lib\bzip2\decompress.c">
<Filter>BZip</Filter>
</ClCompile>
<ClCompile Include="..\mz_compat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_aes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_buf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_bzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_crypt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_lzma.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_mem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_posix.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_strm_zlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_unzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\mz_zip.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\inffixed.h">
<Filter>Zlib</Filter>
</ClInclude>
<ClInclude Include="..\unzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\trees.h">
<Filter>Zlib</Filter>
</ClInclude>
@ -175,9 +172,6 @@
<ClInclude Include="..\..\..\crc32.h">
<Filter>Zlib</Filter>
</ClInclude>
<ClInclude Include="..\zip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\aes\aes.h">
<Filter>AES</Filter>
</ClInclude>
@ -211,43 +205,49 @@
<ClInclude Include="..\lib\bzip2\bzlib.h">
<Filter>BZip</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_buf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_crypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_mem.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_posix.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_win32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\test.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_bzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\bzip2\bzlib_private.h">
<Filter>BZip</Filter>
</ClInclude>
<ClInclude Include="..\mzstrm_lzma.h">
<ClInclude Include="..\mz_strm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_buf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_bzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_crypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_lzma.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_mem.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_posix.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_win32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_strm_zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_unzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\mz_zip.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>