diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-29 13:34:16 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-29 13:34:16 +0200 |
| commit | 466f91bb3beb51f67bdde8267800caa9c943b7a6 (patch) | |
| tree | 7f02e4a404a856b1f1365bcd012af0564fee9b54 | |
| parent | 7df50ef147f201321069fd9c7c3fc631014056ce (diff) | |
| parent | f6bfbe9553b6b87f68f64ff57dad5d2574581e44 (diff) | |
| download | php-git-466f91bb3beb51f67bdde8267800caa9c943b7a6.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix build for libzip < 0.11.2
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 4fedabad1c..b983ba354c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3130,10 +3130,12 @@ static const zend_function_entry zip_class_functions[] = { ZIPARCHIVE_ME(getFromName, arginfo_ziparchive_getfromname, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(getFromIndex, arginfo_ziparchive_getfromindex, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(getStream, arginfo_ziparchive_getstream, ZEND_ACC_PUBLIC) +#ifdef ZIP_OPSYS_DEFAULT ZIPARCHIVE_ME(setExternalAttributesName, arginfo_ziparchive_setextattrname, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(setExternalAttributesIndex, arginfo_ziparchive_setextattrindex, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(getExternalAttributesName, arginfo_ziparchive_getextattrname, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(getExternalAttributesIndex, arginfo_ziparchive_getextattrindex, ZEND_ACC_PUBLIC) +#endif ZIPARCHIVE_ME(setCompressionName, arginfo_ziparchive_setcompname, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(setCompressionIndex, arginfo_ziparchive_setcompindex, ZEND_ACC_PUBLIC) #ifdef HAVE_ENCRYPTION |