diff options
| author | Pierre Joye <pajoye@php.net> | 2008-11-12 11:41:21 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-11-12 11:41:21 +0000 |
| commit | b9853c4ff0dbc3611391ca71ed21e504c6a1e31a (patch) | |
| tree | 805500c5f8f292b4b5540fe14fc0208cc409ec30 /ext/zip/php_zip.h | |
| parent | 512b8127611656c0ea578cf721c4daf60424d3a5 (diff) | |
| download | php-git-b9853c4ff0dbc3611391ca71ed21e504c6a1e31a.tar.gz | |
- MFH:
- #14962, makes extractTo 2nd argument really optional
- replace ZEND_ENGINE_2_1 by PHP_ZIP_USE_OO
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 5d77ac14bd..8398c6558e 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -32,10 +32,8 @@ extern zend_module_entry zip_module_entry; #define PHP_ZIP_VERSION_STRING "1.8.11" -#ifndef ZEND_ENGINE_2_1 -# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) || PHP_MAJOR_VERSION == 6 -# define ZEND_ENGINE_2_1 -# endif +#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 @@ -68,7 +66,7 @@ typedef struct _ze_zip_read_rsrc { struct zip_stat sb; } zip_read_rsrc; -#ifdef ZEND_ENGINE_2_1 +#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) |