Remove redundant _WIN32 compile definition

petk · remicollet · commit 8fe4ba162373 · 2024-06-04T08:02:18.000+02:00
_WIN32 is defined by all compilers on Windows when targeting 32-bit ARM,
64-bit ARM, x86, or x64. This removes redundant definition.
diff --git a/config.w32 b/config.w32
@@ -45,7 +45,7 @@ if (PHP_ZIP != "no") {
 		configure_module_dirname = old_conf_dir;
 
 		AC_DEFINE('HAVE_ZIP', 1);
-		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK");
+		ADD_FLAG("CFLAGS_ZIP", "/D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK");
 		if ((PHP_VERSION == 7 && PHP_MINOR_VERSION >= 4) || PHP_VERSION == 8) {
 			ADD_FLAG("CFLAGS_ZIP", " /D HAVE_CANCEL_CALLBACK");
 		}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ if (PHP_ZIP != "no") {`
`45`	`45`	`configure_module_dirname = old_conf_dir;`
`46`	`46`
`47`	`47`	`AC_DEFINE('HAVE_ZIP', 1);`
`48`		`- ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK");`
	`48`	`+ ADD_FLAG("CFLAGS_ZIP", "/D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK");`
`49`	`49`	`if ((PHP_VERSION == 7 && PHP_MINOR_VERSION >= 4) \|\| PHP_VERSION == 8) {`
`50`	`50`	`ADD_FLAG("CFLAGS_ZIP", " /D HAVE_CANCEL_CALLBACK");`
`51`	`51`	`}`