(Merge 3.4) Issue #25182: Fix compilation on Windows