Fixed compiler warning when using newer versions of libzip.

diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 8c66d6f5d05466bc6fcc10e80c4f515adb3b009d..63bfce79ba6d7351d93af5606592efbf68e7b2ae 100644 (file)
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -20,6 +20,10 @@ if test "$PHP_ZIP" != "no"; then
     AC_MSG_ERROR(Cannot find libzzip)
   fi
 
+  if test -f $ZZIPLIB_INCDIR/zzip/zzip.h; then
+       AC_DEFINE(HAVE_NEW_ZZIPLIB,1,[ ])       
+  fi
+
   ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib
 
   PHP_CHECK_LIBRARY(zzip, zzip_open,

diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 62f170d7f2ea0962ca29338954bbba61cd94a1a1..e8150c9dd1360aafef1bd828a217d7c368ecc427 100644 (file)
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -21,7 +21,11 @@
 
 #if HAVE_ZZIPLIB
 
+#ifdef HAVE_NEW_ZZIPLIB
+#include <zzip/zzip.h>
+#else
 #include <zziplib.h>
+#endif
 
 extern zend_module_entry zip_module_entry;
 #define phpext_zip_ptr &zip_module_entry

diff --git a/ext/zip/zip.c b/ext/zip/zip.c
index 0ff681f2aa30378594e39f63513e4b1573085ef7..6f2452f6b88112897a04db6c599c0e6c31511f2a 100644 (file)
--- a/ext/zip/zip.c
+++ b/ext/zip/zip.c
@@ -29,7 +29,12 @@
 #if HAVE_ZZIPLIB
 
 #include "ext/standard/info.h"
+
+#ifdef HAVE_NEW_ZZIPLIB
+#include <zzip/zzip.h>
+#else
 #include <zziplib.h>
+#endif
 
 #ifndef O_BINARY
 #define O_BINARY 0