diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-11-04 22:26:40 +0100 |
| commit | bf875e269a0df4f4274d0bda2c6504e0757330fc (patch) | |
| tree | 559d6d8b509416b54f705f6b79b865a635918174 /ext/zip/lib/zip_get_encryption_implementation.c | |
| parent | e5e25c43f476456f5b342d4cd289d0ce5f8bbac4 (diff) | |
| parent | 5b8ae0143f5b6cd735e0c201d85556654a89db9e (diff) | |
| download | php-git-bf875e269a0df4f4274d0bda2c6504e0757330fc.tar.gz | |
Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
NEWS + UPGRADING
Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
Fixed coredump due to abnormal implemention of phar
remove "PHP 6" staff
Diffstat (limited to 'ext/zip/lib/zip_get_encryption_implementation.c')
| -rw-r--r-- | ext/zip/lib/zip_get_encryption_implementation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/lib/zip_get_encryption_implementation.c b/ext/zip/lib/zip_get_encryption_implementation.c index 783d538d3f..7dcb99210d 100644 --- a/ext/zip/lib/zip_get_encryption_implementation.c +++ b/ext/zip/lib/zip_get_encryption_implementation.c @@ -37,8 +37,8 @@ -ZIP_EXTERN(zip_encryption_implementation) -zip_get_encryption_implementation(zip_uint16_t em) +zip_encryption_implementation +_zip_get_encryption_implementation(zip_uint16_t em) { if (em == ZIP_EM_TRAD_PKWARE) return zip_source_pkware; |