diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
| commit | bf875e269a0df4f4274d0bda2c6504e0757330fc (patch) | |
| tree | 559d6d8b509416b54f705f6b79b865a635918174 /ext/zip/php_zip.h | |
| parent | e5e25c43f476456f5b342d4cd289d0ce5f8bbac4 (diff) | |
| parent | 5b8ae0143f5b6cd735e0c201d85556654a89db9e (diff) | |
| download | php-git-bf875e269a0df4f4274d0bda2c6504e0757330fc.tar.gz | |
Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
NEWS + UPGRADING
Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
Fixed coredump due to abnormal implemention of phar
remove "PHP 6" staff
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index dace407d14..c8da941b7a 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -28,9 +28,17 @@ extern zend_module_entry zip_module_entry; #include "TSRM.h" #endif +#if defined(HAVE_LIBZIP) +#include <zip.h> +#else #include "lib/zip.h" +#endif -#define PHP_ZIP_VERSION_STRING "1.11.0" +#ifndef ZIP_OVERWRITE +#define ZIP_OVERWRITE ZIP_TRUNCATE +#endif + +#define PHP_ZIP_VERSION "1.12.3" #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) # define PHP_ZIP_USE_OO 1 @@ -67,8 +75,9 @@ typedef struct _ze_zip_read_rsrc { } zip_read_rsrc; #ifdef PHP_ZIP_USE_OO -#define ZIPARCHIVE_ME(name, arg_info, flags) ZEND_FENTRY(name, c_ziparchive_ ##name, arg_info, flags) -#define ZIPARCHIVE_METHOD(name) ZEND_NAMED_FUNCTION(c_ziparchive_##name) +#define ZIPARCHIVE_ME(name, arg_info, flags) {#name, c_ziparchive_ ##name, arg_info,(zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, +#define ZIPARCHIVE_METHOD(name) ZEND_NAMED_FUNCTION(c_ziparchive_ ##name) + /* Extends zend object */ typedef struct _ze_zip_object { |