zip windows fixes

php · Jun 7, 2012 · bde0e8c · bde0e8c
1 parent 8ca457f
commit bde0e8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
@@ -27,14 +27,14 @@ if (PHP_ZIP != "no") {
                      zip_get_archive_comment.c zip_get_file_comment.c \
                      zip_set_archive_comment.c zip_set_file_comment.c \
                      zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
-                     zip_add_dir.c zip_file_error_clear.c zip_error_clear.c
-					 lib/zip_fdopen.c lib/zip_fopen_encrypted.c lib/zip_fopen_index_encrypted.c \
-					 lib/zip_get_compression_implementation.c lib/zip_get_encryption_implementation.c \
-					 lib/zip_get_file_extra.c lib/zip_get_num_entries.c lib/zip_set_default_password.c \
-					 lib/zip_set_file_extra.c lib/zip_source_close.c lib/zip_source_crc.c \
-					 lib/zip_source_deflate.c lib/zip_source_error.c lib/zip_source_layered.c \
-					 lib/zip_source_open.c lib/zip_source_pkware.c lib/zip_source_pop.c \
-					 lib/zip_source_read.c lib/zip_source_stat.c", "zip");
+                     zip_add_dir.c zip_file_error_clear.c zip_error_clear.c \
+                     zip_fdopen.c zip_fopen_encrypted.c zip_fopen_index_encrypted.c \
+                     zip_get_compression_implementation.c zip_get_encryption_implementation.c \
+                     zip_get_file_extra.c zip_get_num_entries.c zip_set_default_password.c \
+                     zip_set_file_extra.c zip_source_close.c zip_source_crc.c \
+                     zip_source_deflate.c zip_source_error.c zip_source_layered.c \
+                     zip_source_open.c zip_source_pkware.c zip_source_pop.c \
+                     zip_source_read.c zip_source_stat.c", "zip");
 
 		AC_DEFINE('HAVE_ZIP', 1);
 	} else {

diff --git a/ext/zip/lib/zipconf.h b/ext/zip/lib/zipconf.h
@@ -13,7 +13,11 @@
 #define LIBZIP_VERSION_MINOR 10
 #define LIBZIP_VERSION_MICRO 0
 
+#ifdef PHP_WIN32
+#include <win32/php_stdint.h>
+#else
 #include <inttypes.h>
+#endif
 
 typedef int8_t zip_int8_t;
 #define ZIP_INT8_MIN INT8_MIN

diff --git a/ext/zip/lib/zipint.h b/ext/zip/lib/zipint.h
@@ -46,10 +46,12 @@
 #define ftello(s)	((long)ftell((s)))
 #endif
 
+#ifndef PHP_WIN32
 #ifndef HAVE_MKSTEMP
 int _zip_mkstemp(char *);
 #define mkstemp _zip_mkstemp
 #endif
+#endif
 
 #ifdef PHP_WIN32
 #include <windows.h>