Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 3b9e822e114a · 2020-01-28T13:35:20.000+01:00
* PHP-7.4:
  Enable support for LIBZIP_VERSION
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
@@ -15,7 +15,7 @@ if (PHP_ZIP != "no") {
 		}
 
 		AC_DEFINE('HAVE_ZIP', 1);
-		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");
+		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION");
 	} else {
 		WARNING("zip not enabled; libraries and headers not found");
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ if (PHP_ZIP != "no") {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`AC_DEFINE('HAVE_ZIP', 1);`
`18`		`- ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");`
	`18`	`+ ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION");`
`19`	`19`	`} else {`
`20`	`20`	`WARNING("zip not enabled; libraries and headers not found");`
`21`	`21`	`}`