From: Christoph M. Becker Date: Sun, 29 Sep 2019 11:31:22 +0000 (+0200) Subject: Fix build for libzip < 0.11.2 X-Git-Tag: php-7.2.24RC1~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6bfbe9553b6b87f68f64ff57dad5d2574581e44;p=php Fix build for libzip < 0.11.2 We must not define method entries, if the actual method definitions or the arginfo structures are not defined. --- diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index d83272f564..7f7880dd6c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3127,10 +3127,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