diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 21:37:15 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 21:37:15 +0100 |
| commit | ba35b22bc4a7af791ff2ab7c2ca8e9f4aa6d64df (patch) | |
| tree | 92d7a7d9dd424b53e50a194af06ec3cfb514633e /ext/zip/zip_stream.c | |
| parent | 88bb9fedc4b5fc750524a7b00be1d46fde2f5929 (diff) | |
| parent | aa52fcf179d9e233075e4d213d5708cc5b5e1ae2 (diff) | |
| download | php-git-ba35b22bc4a7af791ff2ab7c2ca8e9f4aa6d64df.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (35 commits)
Fixed bug #68398 msooxml matches too many archives
Fix zpp call in apache_getenv()
Drop unnecessary zval containers
fixed test
C89 compat
add include for missing localeconv_r proto
updated NEWS
Fixed bug #65230 setting locale randomly broken
Fix compilation error (ref #68424)
Removed useless handlers
Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
Revert unintentional docblock change
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Updated NEWS
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
...
Diffstat (limited to 'ext/zip/zip_stream.c')
| -rw-r--r-- | ext/zip/zip_stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index c542340170..f2537e49c3 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -22,7 +22,7 @@ #endif #include "php.h" #if HAVE_ZIP -#ifdef ZEND_ENGINE_2 +#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) #include "php_streams.h" #include "ext/standard/file.h" @@ -348,5 +348,5 @@ php_stream_wrapper php_stream_zip_wrapper = { NULL, 0 /* is_url */ }; -#endif /* ZEND_ENGINE_2 */ +#endif /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */ #endif /* HAVE_ZIP */ |