com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.h
| From: | Remi Collet | Date: | Wed, 15 Apr 2015 15:38:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86282@lists.php.net to get a copy of this message | ||
Commit: c48bf6e55c2abf0b8f3fb359971375821673f776
Author: Remi Collet <remi@php.net> Wed, 15 Apr 2015 17:38:01 +0200
Parents: 6aee1ee4a187b1653b4e702104e55332ef897691 60b3526bfb5c9fe37d04ff69d0f5e7ea74ed947e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c48bf6e55c2abf0b8f3fb359971375821673f776
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
bump zip release to match pecl version
Changed paths:
MM ext/zip/php_zip.h
Diff:
diff --cc ext/zip/php_zip.h
index 3109905,d5ec6f6..e68c9fc
--- a/ext/zip/php_zip..h
+++ b/ext/zip/php_zip.h
@@@ -38,12 -38,16 +38,12 @@@ extern zend_module_entry zip_module_ent
#define ZIP_OVERWRITE ZIP_TRUNCATE
#endif
- #define PHP_ZIP_VERSION "1.12.4"
+ #define PHP_ZIP_VERSION "1.12.5"
-#if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >=
6)
-# define PHP_ZIP_USE_OO 1
-#endif
-
#ifndef Z_SET_REFCOUNT_P
# if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <
3)
-# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
-# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
+# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
+# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
# endif
#endif