summaryrefslogtreecommitdiff
path: root/ext/zip
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-09-29 13:38:28 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-09-29 13:38:28 +0200
commitce769a94a8d350e4fbe4f95639fff165f7568bab (patch)
treeb50e11ed88ea345b436b4a0699857a3950be22fc /ext/zip
parent7e0f7b7677e2fd76e83c2b731c3c0f3bd1a7279e (diff)
parent466f91bb3beb51f67bdde8267800caa9c943b7a6 (diff)
downloadphp-git-ce769a94a8d350e4fbe4f95639fff165f7568bab.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix build for libzip < 0.11.2
Diffstat (limited to 'ext/zip')
-rw-r--r--ext/zip/php_zip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 71edbe10b9..8b25d7dcbd 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2989,10 +2989,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