Fix nits

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -239,13 +239,10 @@ check_struct_has_member(
 )
 set(HAVE_STRUCT_STAT_ST_RDEV ${PHP_HAVE_STRUCT_STAT_ST_RDEV})
 
-check_struct_has_member(
-  "struct flock"
-  l_type
-  fcntl.h
-  PHP_HAVE_STRUCT_FLOCK
-)
-set(HAVE_STRUCT_FLOCK ${PHP_HAVE_STRUCT_FLOCK})
+cmake_push_check_state(RESET)
+  set(CMAKE_EXTRA_INCLUDE_FILES "fcntl.h")
+  check_type_size("struct flock" STRUCT_FLOCK) # Defines HAVE_STRUCT_FLOCK
+cmake_pop_check_state()
 
 # Check for sockaddr_storage and sockaddr.sa_len.
 cmake_push_check_state(RESET)
@@ -349,7 +346,7 @@ cmake_push_check_state(RESET)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h)
   endif()
-  check_type_size("socklen_t" SOCKLEN_T)
+  check_type_size("socklen_t" SOCKLEN_T) # Defines HAVE_SOCKLEN_T
 cmake_pop_check_state()
 
 ################################################################################

cmake/cmake/platforms/Windows.cmake

@@ -65,6 +65,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_SOCKLEN_T TRUE)
   set(HAVE_STDDEF_H TRUE) # Defined by check_type_size().
   set(HAVE_STDINT_H TRUE) # Defined by check_type_size().
+  set(HAVE_STRUCT_FLOCK FALSE)
+  set(HAVE_SYS_TYPES_H TRUE) # Defined by check_type_size().
   set(HAVE_WS2TCPIP_H TRUE)
   set(PHP_EXT_FILEINFO_HAVE_STRCASESTR FALSE)
   set(PHP_EXT_FILEINFO_HAVE_STRNDUP FALSE)
@@ -205,7 +207,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_STRINGS_H FALSE)
   set(PHP_HAVE_STRLCAT FALSE)
   set(PHP_HAVE_STRLCPY FALSE)
-  set(PHP_HAVE_STRUCT_FLOCK FALSE)
   set(PHP_HAVE_STRUCT_SOCKADDR_SA_LEN FALSE)
   set(PHP_HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
   set(PHP_HAVE_STRUCT_STAT_ST_BLOCKS FALSE)