Merge branch 'PHP-7.4'

* PHP-7.4:
  Check compatibility with proper runtime DLL

Author: cmb69

main/main.c

@@ -2142,12 +2142,18 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 #ifdef PHP_WIN32
 # if PHP_LINKER_MAJOR == 14
 	/* Extend for other CRT if needed. */
+#  if PHP_DEBUG
+#   define PHP_VCRUNTIME "vcruntime140d.dll"
+#  else
+#   define PHP_VCRUNTIME "vcruntime140.dll"
+#  endif
 	char *img_err;
-	if (!php_win32_crt_compatible("vcruntime140.dll", &img_err)) {
+	if (!php_win32_crt_compatible(PHP_VCRUNTIME, &img_err)) {
 		php_error(E_CORE_WARNING, img_err);
 		efree(img_err);
 		return FAILURE;
 	}
+#  undef PHP_VCRUNTIME
 # endif
 
 	/* start up winsock services */