ext/zip: Do not conditionally include zip.h

hughmcmaster · hughmcmaster · commit 36bbca00075e · 2019-05-27T20:43:06.000+10:00
Trust pkg-config to give us the correct include path.
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
@@ -8,8 +8,6 @@ if test "$PHP_ZIP" != "no"; then
 
   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
@@ -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
@@ -27,11 +27,7 @@ extern zend_module_entry zip_module_entry;
 #include "TSRM.h"
 #endif
 
-#if defined(HAVE_LIBZIP)
 #include <zip.h>
-#else
-#include "lib/zip.h"
-#endif
 
 #ifndef ZIP_OVERWRITE
 #define ZIP_OVERWRITE ZIP_TRUNCATE

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ if test "$PHP_ZIP" != "no"; then`
`8`	`8`
`9`	`9`	`PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)`
`10`	`10`
`11`		`- AC_DEFINE(HAVE_LIBZIP, 1, [ ])`
`12`		`-`
`13`	`11`	`PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,`
`14`	`12`	`[`
`15`	`13`	`AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ if (PHP_ZIP != "no") {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`AC_DEFINE('HAVE_ZIP', 1);`
`18`		`- AC_DEFINE('HAVE_LIBZIP', 1);`
`19`	`18`	`ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");`
`20`	`19`	`} else {`
`21`	`20`	`WARNING("zip not enabled; libraries and headers not found");`