From 2eed80b96946a05b2f952e13d76c8764be3d7236 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 21 Jul 2019 10:19:29 +0200 Subject: [PATCH] Remove HAVE_LIBZIP The libzip library is now always used from the system. --- ext/zip/config.m4 | 2 -- ext/zip/config.w32 | 1 - ext/zip/php_zip.h | 4 ---- 3 files changed, 7 deletions(-) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index ae7535f6206e5..0b151b7f2ae32 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -9,8 +9,6 @@ if test "$PHP_ZIP" != "no"; then PHP_EVAL_INCLINE($LIBZIP_CFLAGS) PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBZIP, 1, [ ]) - PHP_CHECK_LIBRARY(zip, zip_file_set_encryption, [ AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support]) diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 17fbbc9806264..2ac637189c65a 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -15,7 +15,6 @@ if (PHP_ZIP != "no") { } AC_DEFINE('HAVE_ZIP', 1); - AC_DEFINE('HAVE_LIBZIP', 1); ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION"); } else { WARNING("zip not enabled; libraries and headers not found"); diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 191be54101eff..0ac9189583cb8 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -27,11 +27,7 @@ extern zend_module_entry zip_module_entry; #include "TSRM.h" #endif -#if defined(HAVE_LIBZIP) #include -#else -#include "lib/zip.h" -#endif #ifndef ZIP_OVERWRITE #define ZIP_OVERWRITE ZIP_TRUNCATE