Skip to content

Commit bde0e8c

Browse files
committed
zip windows fixes
1 parent 8ca457f commit bde0e8c

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

ext/zip/config.w32

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ if (PHP_ZIP != "no") {
2727
zip_get_archive_comment.c zip_get_file_comment.c \
2828
zip_set_archive_comment.c zip_set_file_comment.c \
2929
zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
30-
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c
31-
lib/zip_fdopen.c lib/zip_fopen_encrypted.c lib/zip_fopen_index_encrypted.c \
32-
lib/zip_get_compression_implementation.c lib/zip_get_encryption_implementation.c \
33-
lib/zip_get_file_extra.c lib/zip_get_num_entries.c lib/zip_set_default_password.c \
34-
lib/zip_set_file_extra.c lib/zip_source_close.c lib/zip_source_crc.c \
35-
lib/zip_source_deflate.c lib/zip_source_error.c lib/zip_source_layered.c \
36-
lib/zip_source_open.c lib/zip_source_pkware.c lib/zip_source_pop.c \
37-
lib/zip_source_read.c lib/zip_source_stat.c", "zip");
30+
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c \
31+
zip_fdopen.c zip_fopen_encrypted.c zip_fopen_index_encrypted.c \
32+
zip_get_compression_implementation.c zip_get_encryption_implementation.c \
33+
zip_get_file_extra.c zip_get_num_entries.c zip_set_default_password.c \
34+
zip_set_file_extra.c zip_source_close.c zip_source_crc.c \
35+
zip_source_deflate.c zip_source_error.c zip_source_layered.c \
36+
zip_source_open.c zip_source_pkware.c zip_source_pop.c \
37+
zip_source_read.c zip_source_stat.c", "zip");
3838

3939
AC_DEFINE('HAVE_ZIP', 1);
4040
} else {

ext/zip/lib/zipconf.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
#define LIBZIP_VERSION_MINOR 10
1414
#define LIBZIP_VERSION_MICRO 0
1515

16+
#ifdef PHP_WIN32
17+
#include <win32/php_stdint.h>
18+
#else
1619
#include <inttypes.h>
20+
#endif
1721

1822
typedef int8_t zip_int8_t;
1923
#define ZIP_INT8_MIN INT8_MIN

ext/zip/lib/zipint.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@
4646
#define ftello(s) ((long)ftell((s)))
4747
#endif
4848

49+
#ifndef PHP_WIN32
4950
#ifndef HAVE_MKSTEMP
5051
int _zip_mkstemp(char *);
5152
#define mkstemp _zip_mkstemp
5253
#endif
54+
#endif
5355

5456
#ifdef PHP_WIN32
5557
#include <windows.h>

0 commit comments

Comments
 (0)