diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/zip/zip_stream.c | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/zip/zip_stream.c')
| -rw-r--r-- | ext/zip/zip_stream.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index a1f620182c..a088985198 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -21,7 +21,6 @@ #endif #include "php.h" #if HAVE_ZIP -#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) #include "php_streams.h" #include "ext/standard/file.h" @@ -356,5 +355,4 @@ php_stream_wrapper php_stream_zip_wrapper = { NULL, 0 /* is_url */ }; -#endif /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */ #endif /* HAVE_ZIP */ |