Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/PHP/StandardLibrary.cmake

@@ -42,6 +42,21 @@ set(PHP_C_STANDARD_LIBRARY "" CACHE INTERNAL "The C standard library.")
 
 message(CHECK_START "Checking C standard library")
 
+# The MS C runtime library (CRT).
+if(MSVC)
+  set(_PHP_C_STANDARD_LIBRARY_MSCRT TRUE)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+    check_symbol_exists(_MSC_VER stdio.h _PHP_C_STANDARD_LIBRARY_MSCRT)
+  cmake_pop_check_state()
+endif()
+if(_PHP_C_STANDARD_LIBRARY_MSCRT)
+  set_property(CACHE PHP_C_STANDARD_LIBRARY PROPERTY VALUE "mscrt")
+  message(CHECK_PASS "MS C runtime library (CRT)")
+  return()
+endif()
+
 # The uClibc and its maintained fork uClibc-ng behave like minimalistic GNU C
 # library but have differences. They can be determined by the __UCLIBC__ symbol
 # and must be checked first because they also define the __GLIBC__ symbol.
@@ -100,17 +115,6 @@ if(_PHP_C_STANDARD_LIBRARY_LLVM)
   return()
 endif()
 
-# The MS C runtime library (CRT).
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_symbol_exists(_MSC_VER stdio.h _PHP_C_STANDARD_LIBRARY_MSCRT)
-cmake_pop_check_state()
-if(_PHP_C_STANDARD_LIBRARY_MSCRT)
-  set_property(CACHE PHP_C_STANDARD_LIBRARY PROPERTY VALUE "mscrt")
-  message(CHECK_PASS "MS C runtime library (CRT)")
-  return()
-endif()
-
 # The musl libc doesn't advertise itself with symbols, so it must be determined
 # heuristically.
 cmake_push_check_state(RESET)