ext/date: Fix nits

petk · petk · commit 948a8824e09f · 2025-11-04T23:58:25.000+01:00
On Windows strtoll is redefined in ext/date. And warning flags are now
added unconditionally on Windows.
diff --git a/cmake/ext/date/CMakeLists.txt b/cmake/ext/date/CMakeLists.txt
@@ -45,8 +45,7 @@ set_source_files_properties(
 
 target_compile_options(
   php_ext_date
-  PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,MSVC>:/wd4244>
+  PRIVATE $<$<AND:$<PLATFORM_ID:Windows>,$<COMPILE_LANGUAGE:C>>:/wd4244>
 )
 
 # Configure timelib.
diff --git a/cmake/ext/date/lib/CMakeLists.txt b/cmake/ext/date/lib/CMakeLists.txt
@@ -100,7 +100,7 @@ target_compile_definitions(
   PRIVATE
     HAVE_TIMELIB_CONFIG_H
     # timelib uses C99 strtoll() function conditionally.
-    HAVE_STRTOLL
+    $<$<NOT:$<PLATFORM_ID:Windows>>:HAVE_STRTOLL>
     # timelib includes C99 <stdint.h> header conditionally.
     HAVE_STDINT_H
 )

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ set_source_files_properties(`
`45`	`45`
`46`	`46`	`target_compile_options(`
`47`	`47`	`php_ext_date`
`48`		`- PRIVATE`
`49`		`- $<$<COMPILE_LANG_AND_ID:C,MSVC>:/wd4244>`
	`48`	`+ PRIVATE $<$<AND:$<PLATFORM_ID:Windows>,$<COMPILE_LANGUAGE:C>>:/wd4244>`
`50`	`49`	`)`
`51`	`50`
`52`	`51`	`# Configure timelib.`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ target_compile_definitions(`
`100`	`100`	`PRIVATE`
`101`	`101`	`HAVE_TIMELIB_CONFIG_H`
`102`	`102`	`# timelib uses C99 strtoll() function conditionally.`
`103`		`- HAVE_STRTOLL`
	`103`	`+ $<$<NOT:$<PLATFORM_ID:Windows>>:HAVE_STRTOLL>`
`104`	`104`	`# timelib includes C99 <stdint.h> header conditionally.`
`105`	`105`	`HAVE_STDINT_H`
`106`	`106`	`)`