Skip to content

Commit 9f63836

Browse files
authored
Remove redundant _WIN32 compile definitions (#14458)
_WIN32 is defined by all compilers on Windows when targeting 32-bit ARM, 64-bit ARM, x86, or x64. This removes redundant definition in ext/zip and erroneous CFLAG_ENCHANT variable (should be CFLAGS_ENCHANT).
1 parent cfb7395 commit 9f63836

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

ext/enchant/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ if (PHP_ENCHANT == "yes") {
1818
EXTENSION("enchant", "enchant.c");
1919
AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
2020
AC_DEFINE('HAVE_ENCHANT_GET_VERSION', 1);
21-
ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32");
2221
}
2322
} else {
2423
WARNING('Could not find enchant.h; skipping');

ext/zip/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (PHP_ZIP != "no") {
1717
}
1818

1919
AC_DEFINE('HAVE_ZIP', 1);
20-
ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");
20+
ADD_FLAG("CFLAGS_ZIP", "/D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");
2121
} else {
2222
WARNING("zip not enabled; libraries and headers not found");
2323
}

0 commit comments

Comments
 (0)