bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Recognize the *-*-windows* config triplets introduced on 2023-06-26


From: Bruno Haible
Subject: Recognize the *-*-windows* config triplets introduced on 2023-06-26
Date: Thu, 17 Aug 2023 15:38:59 +0200

Through this commit to config.sub
  
https://git.savannah.gnu.org/gitweb/?p=config.git;a=commitdiff;h=91f6a7f616b161c25ba2001861a40e662e18c4ad
the host_os values windows* (and in particular windows*-gnu* and windows*-msvc*)
were introduced, to denote native Windows environments.

The commit message makes it sound like LLVM and Crablang communities will
use the windows* value, whereas GNU will continue to use mingw*. But I think
it's only a matter of time until people start to pass the option
  --host=x86_64-pc-windows
to configure scripts. We should be prepared for that.

This patch does it.


2023-08-17  Bruno Haible  <bruno@clisp.org>

        Recognize the *-*-windows* config triplets introduced on 2023-06-26.
        * m4/*.m4: Treat windows* as equivalent to mingw*.
        * modules/*: Likewise.

diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
index e794764888..0cab36454d 100644
--- a/m4/absolute-header.m4
+++ b/m4/absolute-header.m4
@@ -1,4 +1,4 @@
-# absolute-header.m4 serial 17
+# absolute-header.m4 serial 18
 dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -66,7 +66,7 @@ AC_DEFUN([gl_ABSOLUTE_HEADER_ONE]
   esac
 changequote(,)
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl For the sake of native Windows compilers (excluding gcc),
       dnl treat backslash as a directory separator, like /.
       dnl Actually, these compilers use a double-backslash as
diff --git a/m4/access.m4 b/m4/access.m4
index 0c8064f2ff..259e2221fa 100644
--- a/m4/access.m4
+++ b/m4/access.m4
@@ -1,4 +1,4 @@
-# access.m4 serial 1
+# access.m4 serial 2
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,6 @@ AC_DEFUN([gl_FUNC_ACCESS]
   dnl On native Windows, access (= _access) does not support the X_OK mode.
   dnl It works by chance on some versions of mingw.
   case "$host_os" in
-    mingw*) REPLACE_ACCESS=1 ;;
+    mingw* | windows*) REPLACE_ACCESS=1 ;;
   esac
 ])
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 1cd100a2d7..c1d956b755 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,4 +1,4 @@
-# btowc.m4 serial 13
+# btowc.m4 serial 14
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,12 +40,12 @@ AC_DEFUN([gl_FUNC_BTOWC]
           [
 changequote(,)dnl
            case "$host_os" in
-                      # Guess no on Cygwin.
-             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
-                      # Guess yes on native Windows.
-             mingw*)  gl_cv_func_btowc_nul="guessing yes" ;;
-                      # Guess yes otherwise.
-             *)       gl_cv_func_btowc_nul="guessing yes" ;;
+                                # Guess no on Cygwin.
+             cygwin*)           gl_cv_func_btowc_nul="guessing no" ;;
+                                # Guess yes on native Windows.
+             mingw* | windows*) gl_cv_func_btowc_nul="guessing yes" ;;
+                                # Guess yes otherwise.
+             *)                 gl_cv_func_btowc_nul="guessing yes" ;;
            esac
 changequote([,])dnl
           ])
@@ -59,12 +59,12 @@ AC_DEFUN([gl_FUNC_BTOWC]
         dnl is present.
 changequote(,)dnl
         case "$host_os" in
-                  # Guess no on IRIX.
-          irix*)  gl_cv_func_btowc_eof="guessing no" ;;
-                  # Guess yes on native Windows.
-          mingw*) gl_cv_func_btowc_eof="guessing yes" ;;
-                  # Guess yes otherwise.
-          *)      gl_cv_func_btowc_eof="guessing yes" ;;
+                             # Guess no on IRIX.
+          irix*)             gl_cv_func_btowc_eof="guessing no" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_btowc_eof="guessing yes" ;;
+                             # Guess yes otherwise.
+          *)                 gl_cv_func_btowc_eof="guessing yes" ;;
         esac
 changequote([,])dnl
         if test $LOCALE_FR != none; then
@@ -116,17 +116,18 @@ AC_DEFUN([gl_FUNC_BTOWC]
           [gl_cv_func_btowc_consistent=yes],
           [gl_cv_func_btowc_consistent=no],
           [case "$host_os" in
-                     # Guess no on mingw.
-             mingw*) AC_EGREP_CPP([Problem], [
+               # Guess no on mingw.
+             mingw* | windows*)
+               AC_EGREP_CPP([Problem], [
 #ifdef __MINGW32__
  Problem
 #endif
-                       ],
-                       [gl_cv_func_btowc_consistent="guessing no"],
-                       [gl_cv_func_btowc_consistent="guessing yes"])
-                     ;;
-                     # Guess yes otherwise.
-             *)      gl_cv_func_btowc_consistent="guessing yes" ;;
+                 ],
+                 [gl_cv_func_btowc_consistent="guessing no"],
+                 [gl_cv_func_btowc_consistent="guessing yes"])
+               ;;
+               # Guess yes otherwise.
+             *) gl_cv_func_btowc_consistent="guessing yes" ;;
            esac
           ])
       ])
diff --git a/m4/build-to-host.m4 b/m4/build-to-host.m4
index 8964ee84a4..ad22a0a61a 100644
--- a/m4/build-to-host.m4
+++ b/m4/build-to-host.m4
@@ -1,4 +1,4 @@
-# build-to-host.m4 serial 2
+# build-to-host.m4 serial 3
 dnl Copyright (C) 2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,7 +41,7 @@ AC_DEFUN([gl_BUILD_TO_HOST]
   case "$build_os" in
     cygwin*)
       case "$host_os" in
-        mingw*)
+        mingw* | windows*)
           gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
       esac
       ;;
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index 3789cbffbf..e2f5677556 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,4 +1,4 @@
-# calloc.m4 serial 30
+# calloc.m4 serial 31
 
 # Copyright (C) 2004-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -41,7 +41,7 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF]
                              # Guess yes on musl systems.
          *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
                              # Guess yes on native Windows.
-         mingw*)             ac_cv_func_calloc_0_nonnull="guessing yes" ;;
+         mingw* | windows*)  ac_cv_func_calloc_0_nonnull="guessing yes" ;;
                              # If we don't know, obey --enable-cross-guesses.
          *)                  
ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;;
        esac
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index d319645fd3..8a1522f61b 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-# canonicalize.m4 serial 38
+# canonicalize.m4 serial 39
 
 dnl Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc.
 
@@ -66,8 +66,8 @@ AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE]
   dnl available through the linker option '-loldnames'.
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) ;;
-    *)      AC_CHECK_FUNCS([getcwd]) ;;
+    mingw* | windows*) ;;
+    *) AC_CHECK_FUNCS([getcwd]) ;;
   esac
 
   AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
@@ -158,16 +158,16 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS]
       esac
      ],
      [case "$host_os" in
-                       # Guess yes on glibc systems.
-        *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-                       # Guess 'nearly' on musl systems.
-        *-musl*)       gl_cv_func_realpath_works="guessing nearly" ;;
-                       # Guess no on Cygwin.
-        cygwin*)       gl_cv_func_realpath_works="guessing no" ;;
-                       # Guess no on native Windows.
-        mingw*)        gl_cv_func_realpath_works="guessing no" ;;
-                       # If we don't know, obey --enable-cross-guesses.
-        *)             gl_cv_func_realpath_works="$gl_cross_guess_normal" ;;
+                           # Guess yes on glibc systems.
+        *-gnu* | gnu*)     gl_cv_func_realpath_works="guessing yes" ;;
+                           # Guess 'nearly' on musl systems.
+        *-musl*)           gl_cv_func_realpath_works="guessing nearly" ;;
+                           # Guess no on Cygwin.
+        cygwin*)           gl_cv_func_realpath_works="guessing no" ;;
+                           # Guess no on native Windows.
+        mingw* | windows*) gl_cv_func_realpath_works="guessing no" ;;
+                           # If we don't know, obey --enable-cross-guesses.
+        *)                 gl_cv_func_realpath_works="$gl_cross_guess_normal" 
;;
       esac
      ])
     rm -rf conftest.a conftest.l conftest.d
diff --git a/m4/cbrtf.m4 b/m4/cbrtf.m4
index 0e876a01f9..3b8b7c5148 100644
--- a/m4/cbrtf.m4
+++ b/m4/cbrtf.m4
@@ -1,4 +1,4 @@
-# cbrtf.m4 serial 4
+# cbrtf.m4 serial 5
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -91,10 +91,10 @@ AC_DEFUN([gl_FUNC_CBRTF_WORKS]
         [gl_cv_func_cbrtf_works=yes],
         [gl_cv_func_cbrtf_works=no],
         [case "$host_os" in
-           irix*)  gl_cv_func_cbrtf_works="guessing no";;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_cbrtf_works="guessing yes";;
-           *)      gl_cv_func_cbrtf_works="guessing yes";;
+           irix*)             gl_cv_func_cbrtf_works="guessing no";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_cbrtf_works="guessing yes";;
+           *)                 gl_cv_func_cbrtf_works="guessing yes";;
          esac
         ])
     ])
diff --git a/m4/cbrtl.m4 b/m4/cbrtl.m4
index ff19b049b5..f0b6102bd7 100644
--- a/m4/cbrtl.m4
+++ b/m4/cbrtl.m4
@@ -1,4 +1,4 @@
-# cbrtl.m4 serial 11
+# cbrtl.m4 serial 12
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -77,7 +77,7 @@ AC_DEFUN([gl_FUNC_CBRTL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_cbrtl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_cbrtl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_cbrtl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_cbrtl_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -147,10 +147,10 @@ AC_DEFUN([gl_FUNC_CBRTL_WORKS]
         [gl_cv_func_cbrtl_works=yes],
         [gl_cv_func_cbrtl_works=no],
         [case "$host_os" in
-           openbsd*) gl_cv_func_cbrtl_works="guessing no";;
-                     # Guess yes on native Windows.
-           mingw*)   gl_cv_func_cbrtl_works="guessing yes";;
-           *)        gl_cv_func_cbrtl_works="guessing yes";;
+           openbsd*)          gl_cv_func_cbrtl_works="guessing no";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_cbrtl_works="guessing yes";;
+           *)                 gl_cv_func_cbrtl_works="guessing yes";;
          esac
         ])
     ])
diff --git a/m4/ceil.m4 b/m4/ceil.m4
index 1e66c9ecd0..812497ac58 100644
--- a/m4/ceil.m4
+++ b/m4/ceil.m4
@@ -1,4 +1,4 @@
-# ceil.m4 serial 16
+# ceil.m4 serial 17
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([gl_FUNC_CEIL]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_ceil_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_ceil_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_ceil_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_ceil_ieee="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/ceilf.m4 b/m4/ceilf.m4
index 8156c1d7e0..e82dc1a093 100644
--- a/m4/ceilf.m4
+++ b/m4/ceilf.m4
@@ -1,4 +1,4 @@
-# ceilf.m4 serial 20
+# ceilf.m4 serial 21
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -58,7 +58,7 @@ AC_DEFUN([gl_FUNC_CEILF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_ceilf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_ceilf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_ceilf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_ceilf_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/ceill.m4 b/m4/ceill.m4
index d7d708e28e..d2f73ac6e9 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,4 +1,4 @@
-# ceill.m4 serial 23
+# ceill.m4 serial 24
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_CEILL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_ceill_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_ceill_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_ceill_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_ceill_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -89,9 +89,9 @@ AC_DEFUN([gl_FUNC_CEILL]
          [gl_cv_func_ceill_works=no],
          [case "$host_os" in
             openbsd*) gl_cv_func_ceill_works="guessing no" ;;
-                      # Guess yes on native Windows.
-            mingw*)   gl_cv_func_ceill_works="guessing yes" ;;
-            *)        gl_cv_func_ceill_works="guessing yes" ;;
+                               # Guess yes on native Windows.
+            mingw* | windows*) gl_cv_func_ceill_works="guessing yes" ;;
+            *)                 gl_cv_func_ceill_works="guessing yes" ;;
           esac
          ])
        LIBS="$save_LIBS"
diff --git a/m4/chmod.m4 b/m4/chmod.m4
index 464fbc3203..6413695056 100644
--- a/m4/chmod.m4
+++ b/m4/chmod.m4
@@ -1,4 +1,4 @@
-# chmod.m4 serial 2
+# chmod.m4 serial 3
 dnl Copyright (C) 2004-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -59,7 +59,7 @@ AC_DEFUN([gl_FUNC_CHMOD]
        [gl_cv_func_chmod_works=no],
        [case "$host_os" in
           # Guess no on AIX, IRIX, native Windows.
-          aix* | irix* | mingw*)
+          aix* | irix* | mingw* | windows*)
             gl_cv_func_chmod_works="guessing no" ;;
           # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, OpenBSD, 
Solaris, Haiku, Cygwin.
           *-gnu* | gnu* | *-musl* | darwin* | freebsd* | midnightbsd* | 
netbsd* | openbsd* | solaris* | haiku* | cygwin*)
diff --git a/m4/chown.m4 b/m4/chown.m4
index 3e05f85a2d..9fde1d681d 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,4 +1,4 @@
-# serial 35
+# serial 36
 # Determine whether we need the chown wrapper.
 
 dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2023 Free Software
@@ -46,14 +46,14 @@ AC_DEFUN([AC_FUNC_CHOWN]
        [ac_cv_func_chown_works=yes],
        [ac_cv_func_chown_works=no],
        [case "$host_os" in # ((
-                           # Guess yes on Linux systems.
-          linux-* | linux) ac_cv_func_chown_works="guessing yes" ;;
-                           # Guess yes on glibc systems.
-          *-gnu* | gnu*)   ac_cv_func_chown_works="guessing yes" ;;
-                           # Guess no on native Windows.
-          mingw*)          ac_cv_func_chown_works="guessing no" ;;
-                           # If we don't know, obey --enable-cross-guesses.
-          *)               ac_cv_func_chown_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on Linux systems.
+          linux-* | linux)   ac_cv_func_chown_works="guessing yes" ;;
+                             # Guess yes on glibc systems.
+          *-gnu* | gnu*)     ac_cv_func_chown_works="guessing yes" ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) ac_cv_func_chown_works="guessing no" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 ac_cv_func_chown_works="$gl_cross_guess_normal" ;;
         esac
        ])
      rm -f conftest.chown
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 28534db1c7..7ed718c003 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,4 +1,4 @@
-# clock_time.m4 serial 13
+# clock_time.m4 serial 14
 dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,7 +32,7 @@ AC_DEFUN([gl_CLOCK_TIME]
   CLOCK_TIME_LIB=
   AC_SUBST([CLOCK_TIME_LIB])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       ac_cv_func_clock_getres=no
       ac_cv_func_clock_gettime=no
       ac_cv_func_clock_settime=no
diff --git a/m4/creat.m4 b/m4/creat.m4
index 0c2207cadd..fd7f9cae72 100644
--- a/m4/creat.m4
+++ b/m4/creat.m4
@@ -1,4 +1,4 @@
-# creat.m4 serial 1
+# creat.m4 serial 2
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_CREAT]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       REPLACE_CREAT=1
       ;;
     *)
diff --git a/m4/csharpexec.m4 b/m4/csharpexec.m4
index 3c0ac492e1..89fe824e30 100644
--- a/m4/csharpexec.m4
+++ b/m4/csharpexec.m4
@@ -1,4 +1,4 @@
-# csharpexec.m4 serial 8
+# csharpexec.m4 serial 9
 dnl Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,7 @@ AC_DEFUN([gt_CSHARPEXEC]
            m4_if([$1], , , [&& clix $2/$1 >/dev/null 2>/dev/null]); then
           HAVE_CLIX=1
           case $host_os in
-            cygwin* | mingw* | pw32*)
+            cygwin* | mingw* | windows* | pw32*)
               CLIX_PATH_VAR=PATH
               ;;
             darwin* | rhapsody*)
diff --git a/m4/ctime.m4 b/m4/ctime.m4
index 4fe21b0c95..199905ddfb 100644
--- a/m4/ctime.m4
+++ b/m4/ctime.m4
@@ -1,4 +1,4 @@
-# ctime.m4 serial 3
+# ctime.m4 serial 4
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,6 @@ AC_DEFUN([gl_FUNC_CTIME]
   AC_REQUIRE([gl_TIME_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) REPLACE_CTIME=1 ;;
+    mingw* | windows*) REPLACE_CTIME=1 ;;
   esac
 ])
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 58f3311535..a4c32003b0 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,4 +1,4 @@
-# serial 21
+# serial 22
 
 dnl From Jim Meyering.
 dnl
@@ -40,16 +40,16 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO]
            [gl_cv_struct_dirent_d_ino=yes],
            [gl_cv_struct_dirent_d_ino=no],
            [case "$host_os" in
-                            # Guess yes on glibc systems with Linux kernel.
-              linux*-gnu*)  gl_cv_struct_dirent_d_ino="guessing yes" ;;
-                            # Guess yes on musl systems with Linux kernel.
-              linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-                            # Guess yes on systems that emulate the Linux 
system calls.
-              midipix*)     gl_cv_struct_dirent_d_ino="guessing yes" ;;
-                            # Guess no on native Windows.
-              mingw*)       gl_cv_struct_dirent_d_ino="guessing no" ;;
-                            # If we don't know, obey --enable-cross-guesses.
-              *)            gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" 
;;
+                                 # Guess yes on glibc systems with Linux 
kernel.
+              linux*-gnu*)       gl_cv_struct_dirent_d_ino="guessing yes" ;;
+                                 # Guess yes on musl systems with Linux kernel.
+              linux*-musl*)      gl_cv_struct_dirent_d_ino="guessing yes" ;;
+                                 # Guess yes on systems that emulate the Linux 
system calls.
+              midipix*)          gl_cv_struct_dirent_d_ino="guessing yes" ;;
+                                 # Guess no on native Windows.
+              mingw* | windows*) gl_cv_struct_dirent_d_ino="guessing no" ;;
+                                 # If we don't know, obey 
--enable-cross-guesses.
+              *)                 
gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;;
             esac
            ])])
    case "$gl_cv_struct_dirent_d_ino" in
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index b6c189c0d9..922dd77862 100644
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,4 +1,4 @@
-# dirent_h.m4 serial 20
+# dirent_h.m4 serial 21
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -38,8 +38,8 @@ AC_DEFUN_ONCE([gl_DIRENT_DIR]
   dnl it's simpler since we know the affected platforms.
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) DIR_HAS_FD_MEMBER=0 ;;
-    *)      DIR_HAS_FD_MEMBER=1 ;;
+    mingw* | windows*) DIR_HAS_FD_MEMBER=0 ;;
+    *)                 DIR_HAS_FD_MEMBER=1 ;;
   esac
   AC_SUBST([DIR_HAS_FD_MEMBER])
 ])
diff --git a/m4/dup.m4 b/m4/dup.m4
index fc41c99c3e..6243d51751 100644
--- a/m4/dup.m4
+++ b/m4/dup.m4
@@ -1,4 +1,4 @@
-# dup.m4 serial 7
+# dup.m4 serial 8
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,9 +36,9 @@ AC_DEFUN([gl_FUNC_DUP]
       [gl_cv_func_dup_works=yes],
       [gl_cv_func_dup_works=no],
       [case "$host_os" in
-                 # Guess no on native Windows.
-         mingw*) gl_cv_func_dup_works="guessing no" ;;
-         *)      gl_cv_func_dup_works="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_dup_works="guessing no" ;;
+         *)                 gl_cv_func_dup_works="guessing yes" ;;
        esac
       ])
     ])
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index e1cc73e18d..876e0d8bd2 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,4 +1,4 @@
-#serial 27
+#serial 28
 dnl Copyright (C) 2002, 2005, 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -67,7 +67,7 @@ AC_DEFUN([gl_FUNC_DUP2]
       ],
       [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
       [case "$host_os" in
-         mingw*) # on this platform, dup2 always returns 0 for success
+         mingw* | windows*) # on this platform, dup2 always returns 0 for 
success
            gl_cv_func_dup2_works="guessing no" ;;
          cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
            gl_cv_func_dup2_works="guessing no" ;;
diff --git a/m4/execl.m4 b/m4/execl.m4
index 4ca7daf6f1..b80fbfbe2f 100644
--- a/m4/execl.m4
+++ b/m4/execl.m4
@@ -1,4 +1,4 @@
-# execl.m4 serial 1
+# execl.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECL]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECL=1 ;;
+    mingw* | windows*) REPLACE_EXECL=1 ;;
   esac
 ])
diff --git a/m4/execle.m4 b/m4/execle.m4
index d72f0eb90c..df0aeefd1f 100644
--- a/m4/execle.m4
+++ b/m4/execle.m4
@@ -1,4 +1,4 @@
-# execle.m4 serial 1
+# execle.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECLE]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECLE=1 ;;
+    mingw* | windows*) REPLACE_EXECLE=1 ;;
   esac
 ])
diff --git a/m4/execlp.m4 b/m4/execlp.m4
index ea60f09009..95c35c843a 100644
--- a/m4/execlp.m4
+++ b/m4/execlp.m4
@@ -1,4 +1,4 @@
-# execlp.m4 serial 1
+# execlp.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECLP]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECLP=1 ;;
+    mingw* | windows*) REPLACE_EXECLP=1 ;;
   esac
 ])
diff --git a/m4/execv.m4 b/m4/execv.m4
index 5dbacf62c6..9f256e0bd0 100644
--- a/m4/execv.m4
+++ b/m4/execv.m4
@@ -1,4 +1,4 @@
-# execv.m4 serial 1
+# execv.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECV]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECV=1 ;;
+    mingw* | windows*) REPLACE_EXECV=1 ;;
   esac
 ])
diff --git a/m4/execve.m4 b/m4/execve.m4
index c94aacb615..0e7914d29c 100644
--- a/m4/execve.m4
+++ b/m4/execve.m4
@@ -1,4 +1,4 @@
-# execve.m4 serial 1
+# execve.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECVE]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECVE=1 ;;
+    mingw* | windows*) REPLACE_EXECVE=1 ;;
   esac
 ])
diff --git a/m4/execvp.m4 b/m4/execvp.m4
index 69d11caebb..39c816303d 100644
--- a/m4/execvp.m4
+++ b/m4/execvp.m4
@@ -1,4 +1,4 @@
-# execvp.m4 serial 1
+# execvp.m4 serial 2
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,6 @@ AC_DEFUN([gl_FUNC_EXECVP]
   AC_REQUIRE([AC_CANONICAL_HOST])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECVP=1 ;;
+    mingw* | windows*) REPLACE_EXECVP=1 ;;
   esac
 ])
diff --git a/m4/execvpe.m4 b/m4/execvpe.m4
index 3f211049b8..8992566ff5 100644
--- a/m4/execvpe.m4
+++ b/m4/execvpe.m4
@@ -1,4 +1,4 @@
-# execvpe.m4 serial 3
+# execvpe.m4 serial 4
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_EXECVPE]
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   case "$host_os" in
-    mingw*) REPLACE_EXECVPE=1 ;;
+    mingw* | windows*) REPLACE_EXECVPE=1 ;;
     *)
       gl_CHECK_FUNCS_ANDROID([execvpe], [[#include <unistd.h>]])
       if test $ac_cv_func_execvpe != yes; then
diff --git a/m4/exp2.m4 b/m4/exp2.m4
index 3b71f96bb5..cdd1f295d7 100644
--- a/m4/exp2.m4
+++ b/m4/exp2.m4
@@ -1,4 +1,4 @@
-# exp2.m4 serial 3
+# exp2.m4 serial 4
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -136,10 +136,10 @@ AC_DEFUN([gl_FUNC_EXP2_WORKS]
         [gl_cv_func_exp2_works=yes],
         [gl_cv_func_exp2_works=no],
         [case "$host_os" in
-           openbsd*) gl_cv_func_exp2_works="guessing no" ;;
-                     # Guess yes on native Windows.
-           mingw*)   gl_cv_func_exp2_works="guessing yes" ;;
-           *)        gl_cv_func_exp2_works="guessing yes" ;;
+           openbsd*)          gl_cv_func_exp2_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_exp2_works="guessing yes" ;;
+           *)                 gl_cv_func_exp2_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/exp2l.m4 b/m4/exp2l.m4
index 3d7d5d713a..fc0bcd1944 100644
--- a/m4/exp2l.m4
+++ b/m4/exp2l.m4
@@ -1,4 +1,4 @@
-# exp2l.m4 serial 11
+# exp2l.m4 serial 12
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -104,7 +104,7 @@ AC_DEFUN([gl_FUNC_EXP2L]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_exp2l_works="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_exp2l_works="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_exp2l_works="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_exp2l_works="$gl_cross_guess_normal" ;;
              esac
@@ -159,7 +159,7 @@ AC_DEFUN([gl_FUNC_EXP2L]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_exp2l_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_exp2l_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_exp2l_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_exp2l_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/expl.m4 b/m4/expl.m4
index 842d5a5101..1d9cc4b59a 100644
--- a/m4/expl.m4
+++ b/m4/expl.m4
@@ -1,4 +1,4 @@
-# expl.m4 serial 19
+# expl.m4 serial 20
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -153,7 +153,7 @@ AC_DEFUN([gl_FUNC_EXPL]
                                    # Guess no on musl systems.
                *-musl* | midipix*) gl_cv_func_expl_works="guessing no" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_expl_works="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_expl_works="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_expl_works="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/expm1.m4 b/m4/expm1.m4
index 1a456e249d..a223de03d9 100644
--- a/m4/expm1.m4
+++ b/m4/expm1.m4
@@ -1,4 +1,4 @@
-# expm1.m4 serial 10
+# expm1.m4 serial 11
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,7 @@ AC_DEFUN([gl_FUNC_EXPM1]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_expm1_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_expm1_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_expm1_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_expm1_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/expm1f.m4 b/m4/expm1f.m4
index 183b0e9801..eeb789216e 100644
--- a/m4/expm1f.m4
+++ b/m4/expm1f.m4
@@ -1,4 +1,4 @@
-# expm1f.m4 serial 5
+# expm1f.m4 serial 6
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -82,7 +82,7 @@ AC_DEFUN([gl_FUNC_EXPM1F]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_expm1f_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_expm1f_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_expm1f_ieee="guessing yes" ;;
                                      # Guess no on AIX.
                  aix*)               gl_cv_func_expm1f_ieee="guessing no" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
@@ -132,10 +132,10 @@ AC_DEFUN([gl_FUNC_EXPM1F_WORKS]
         [gl_cv_func_expm1f_works=yes],
         [gl_cv_func_expm1f_works=no],
         [case "$host_os" in
-           irix*)  gl_cv_func_expm1f_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_expm1f_works="guessing yes" ;;
-           *)      gl_cv_func_expm1f_works="guessing yes" ;;
+           irix*)             gl_cv_func_expm1f_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_expm1f_works="guessing yes" ;;
+           *)                 gl_cv_func_expm1f_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/expm1l.m4 b/m4/expm1l.m4
index 78c7a3d579..b6458ef95c 100644
--- a/m4/expm1l.m4
+++ b/m4/expm1l.m4
@@ -1,4 +1,4 @@
-# expm1l.m4 serial 10
+# expm1l.m4 serial 11
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -151,7 +151,7 @@ AC_DEFUN([gl_FUNC_EXPM1L]
                                    # Guess no on musl systems.
                *-musl* | midipix*) gl_cv_func_expm1l_works="guessing no" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_expm1l_works="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_expm1l_works="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_expm1l_works="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/exponentl.m4 b/m4/exponentl.m4
index bc5638737e..c9ba2eae79 100644
--- a/m4/exponentl.m4
+++ b/m4/exponentl.m4
@@ -1,4 +1,4 @@
-# exponentl.m4 serial 6
+# exponentl.m4 serial 7
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -82,8 +82,9 @@ AC_DEFUN_ONCE([gl_LONG_DOUBLE_EXPONENT_LOCATION]
           dnl ABI and compiler version. There are too many cases.
           gl_cv_cc_long_double_expbit0="unknown"
           case "$host_os" in
-            mingw*) # On native Windows (little-endian), we know the result
-                    # in two cases: mingw, MSVC.
+            mingw* | windows*)
+              # On native Windows (little-endian), we know the result
+              # in two cases: mingw, MSVC.
               AC_EGREP_CPP([Known], [
 #ifdef __MINGW32__
  Known
diff --git a/m4/fabsl.m4 b/m4/fabsl.m4
index ecdb3ce8fb..30a9348e67 100644
--- a/m4/fabsl.m4
+++ b/m4/fabsl.m4
@@ -1,4 +1,4 @@
-# fabsl.m4 serial 3
+# fabsl.m4 serial 4
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -66,10 +66,10 @@ AC_DEFUN([gl_FUNC_FABSL_WORKS]
         [gl_cv_func_fabsl_works=yes],
         [gl_cv_func_fabsl_works=no],
         [case "$host_os" in
-           irix*)  gl_cv_func_fabsl_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_fabsl_works="guessing yes" ;;
-           *)      gl_cv_func_fabsl_works="guessing yes" ;;
+           irix*)             gl_cv_func_fabsl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_fabsl_works="guessing yes" ;;
+           *)                 gl_cv_func_fabsl_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index b587e0eadd..72206baf98 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -1,4 +1,4 @@
-# fchdir.m4 serial 28
+# fchdir.m4 serial 29
 dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,16 +32,16 @@ AC_DEFUN([gl_FUNC_FCHDIR]
          [gl_cv_func_open_directory_works=yes],
          [gl_cv_func_open_directory_works=no],
          [case "$host_os" in
-                             # Guess yes on Linux systems.
-            linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;;
-                             # Guess yes on systems that emulate the Linux 
system calls.
-            midipix*)        gl_cv_func_open_directory_works="guessing yes" ;;
-                             # Guess yes on glibc systems.
-            *-gnu* | gnu*)   gl_cv_func_open_directory_works="guessing yes" ;;
-                             # Guess no on native Windows.
-            mingw*)          gl_cv_func_open_directory_works="guessing no" ;;
-                             # If we don't know, obey --enable-cross-guesses.
-            *)               
gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;;
+                               # Guess yes on Linux systems.
+            linux-* | linux)   gl_cv_func_open_directory_works="guessing yes" 
;;
+                               # Guess yes on systems that emulate the Linux 
system calls.
+            midipix*)          gl_cv_func_open_directory_works="guessing yes" 
;;
+                               # Guess yes on glibc systems.
+            *-gnu* | gnu*)     gl_cv_func_open_directory_works="guessing yes" 
;;
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_open_directory_works="guessing no" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+            *)                 
gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;;
           esac
          ])])
     case "$gl_cv_func_open_directory_works" in
diff --git a/m4/fclose.m4 b/m4/fclose.m4
index e9291f0bda..f076a7b963 100644
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,4 +1,4 @@
-# fclose.m4 serial 11
+# fclose.m4 serial 12
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -88,7 +88,7 @@ AC_DEFUN([gl_FUNC_FCLOSE_STDIN]
                               # Guess yes on musl systems.
           *-musl* | midipix*) gl_cv_func_fclose_stdin="guessing yes" ;;
                               # Guess no on native Windows.
-          mingw*)             gl_cv_func_fclose_stdin="guessing no" ;;
+          mingw* | windows*)  gl_cv_func_fclose_stdin="guessing no" ;;
                               # If we don't know, obey --enable-cross-guesses.
           *)                  gl_cv_func_fclose_stdin="$gl_cross_guess_normal" 
;;
         esac
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
index 59d558bdd4..2fc3d09ad7 100644
--- a/m4/fcntl-o.m4
+++ b/m4/fcntl-o.m4
@@ -1,4 +1,4 @@
-# fcntl-o.m4 serial 7
+# fcntl-o.m4 serial 8
 dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -117,9 +117,9 @@ AC_DEFUN([gl_FCNTL_O_FLAGS]
          *) gl_cv_header_working_fcntl_h='no';;
         esac],
        [case "$host_os" in
-                  # Guess 'no' on native Windows.
-          mingw*) gl_cv_header_working_fcntl_h='no' ;;
-          *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
+                             # Guess 'no' on native Windows.
+          mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;;
+          *)                 gl_cv_header_working_fcntl_h=cross-compiling ;;
         esac
        ])
     ])
diff --git a/m4/fdopen.m4 b/m4/fdopen.m4
index 6b3909b8fc..328cfd249a 100644
--- a/m4/fdopen.m4
+++ b/m4/fdopen.m4
@@ -1,4 +1,4 @@
-# fdopen.m4 serial 5
+# fdopen.m4 serial 6
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,8 +36,8 @@ AC_DEFUN([gl_FUNC_FDOPEN]
           [gl_cv_func_fdopen_works=yes],
           [gl_cv_func_fdopen_works=no],
           [case "$host_os" in
-             mingw*) gl_cv_func_fdopen_works="guessing no" ;;
-             *)      gl_cv_func_fdopen_works="guessing yes" ;;
+             mingw* | windows*) gl_cv_func_fdopen_works="guessing no" ;;
+             *)                 gl_cv_func_fdopen_works="guessing yes" ;;
            esac
           ])
       ])
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 3e3c8903aa..6f819de364 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 18
+# fflush.m4 serial 19
 
 # Copyright (C) 2007-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -79,9 +79,9 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN]
        [gl_cv_func_fflush_stdin=yes],
        [gl_cv_func_fflush_stdin=no],
        [case "$host_os" in
-                  # Guess no on native Windows.
-          mingw*) gl_cv_func_fflush_stdin="guessing no" ;;
-          *)      gl_cv_func_fflush_stdin=cross ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;;
+          *)                 gl_cv_func_fflush_stdin=cross ;;
         esac
        ])
      rm conftest.txt
diff --git a/m4/ffsll.m4 b/m4/ffsll.m4
index 0242dd9dad..9268f3a7bf 100644
--- a/m4/ffsll.m4
+++ b/m4/ffsll.m4
@@ -1,4 +1,4 @@
-# ffsll.m4 serial 5
+# ffsll.m4 serial 6
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@ AC_DEFUN([gl_FUNC_FFSLL]
                                 # Guess yes on musl systems.
             *-musl* | midipix*) gl_cv_func_ffsll_works="guessing yes" ;;
                                 # Guess yes on native Windows.
-            mingw*)             gl_cv_func_ffsll_works="guessing yes" ;;
+            mingw* | windows*)  gl_cv_func_ffsll_works="guessing yes" ;;
                                 # Guess no on AIX.
             aix*)               gl_cv_func_ffsll_works="guessing no" ;;
                                 # If we don't know, obey 
--enable-cross-guesses.
diff --git a/m4/float_h.m4 b/m4/float_h.m4
index 2f0c9c4ee9..95897cf17b 100644
--- a/m4/float_h.m4
+++ b/m4/float_h.m4
@@ -1,4 +1,4 @@
-# float_h.m4 serial 13
+# float_h.m4 serial 14
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -84,9 +84,11 @@ AC_DEFUN([gl_FLOAT_H]
                [gl_cv_func_itold_works="guessing no"],
                [gl_cv_func_itold_works="guessing yes"])
              ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_itold_works="guessing yes" ;;
-           *)      gl_cv_func_itold_works="guessing yes" ;;
+             # Guess yes on native Windows.
+           mingw* | windows*)
+             gl_cv_func_itold_works="guessing yes" ;;
+           *)
+             gl_cv_func_itold_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/floor.m4 b/m4/floor.m4
index ebab1e7bbe..d2fd3422b8 100644
--- a/m4/floor.m4
+++ b/m4/floor.m4
@@ -1,4 +1,4 @@
-# floor.m4 serial 15
+# floor.m4 serial 16
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_FLOOR]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_floor_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_floor_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_floor_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_floor_ieee="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 4ddb122de8..2c3b0ccf37 100644
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -1,4 +1,4 @@
-# floorf.m4 serial 19
+# floorf.m4 serial 20
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -54,7 +54,7 @@ AC_DEFUN([gl_FUNC_FLOORF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_floorf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_floorf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_floorf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_floorf_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/fma.m4 b/m4/fma.m4
index 4fce225a30..22755e8018 100644
--- a/m4/fma.m4
+++ b/m4/fma.m4
@@ -1,4 +1,4 @@
-# fma.m4 serial 4
+# fma.m4 serial 5
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -171,7 +171,12 @@ AC_DEFUN([gl_FUNC_FMA_WORKS]
          dnl Otherwise guess no, even on glibc systems.
          gl_cv_func_fma_works="$gl_cross_guess_normal"
          case "$host_os" in
-           mingw*)
+           windows*-gnu*)
+             ;;
+           windows*-msvc*)
+             gl_cv_func_fma_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
diff --git a/m4/fmaf.m4 b/m4/fmaf.m4
index 69e66747f5..1f7d2b79eb 100644
--- a/m4/fmaf.m4
+++ b/m4/fmaf.m4
@@ -1,4 +1,4 @@
-# fmaf.m4 serial 6
+# fmaf.m4 serial 7
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -190,7 +190,12 @@ AC_DEFUN([gl_FUNC_FMAF_WORKS]
          dnl Otherwise guess no, even on glibc systems.
          gl_cv_func_fmaf_works="$gl_cross_guess_normal"
          case "$host_os" in
-           mingw*)
+           windows*-gnu*)
+             ;;
+           windows*-msvc*)
+             gl_cv_func_fmaf_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
diff --git a/m4/fmal.m4 b/m4/fmal.m4
index 3ed7c2e979..8aade89fc7 100644
--- a/m4/fmal.m4
+++ b/m4/fmal.m4
@@ -1,4 +1,4 @@
-# fmal.m4 serial 8
+# fmal.m4 serial 9
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -388,7 +388,12 @@ AC_DEFUN([gl_FUNC_FMAL_WORKS]
          dnl Otherwise guess no, even on glibc systems.
          gl_cv_func_fmal_works="$gl_cross_guess_normal"
          case "$host_os" in
-           mingw*)
+           windows*-gnu*)
+             ;;
+           windows*-msvc*)
+             gl_cv_func_fmal_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
diff --git a/m4/fmod.m4 b/m4/fmod.m4
index fe7c8f41f8..16596c1553 100644
--- a/m4/fmod.m4
+++ b/m4/fmod.m4
@@ -1,4 +1,4 @@
-# fmod.m4 serial 10
+# fmod.m4 serial 11
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_FMOD]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_fmod_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_fmod_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_fmod_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_fmod_ieee="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/fmodf.m4 b/m4/fmodf.m4
index 33ea15887d..47592337b5 100644
--- a/m4/fmodf.m4
+++ b/m4/fmodf.m4
@@ -1,4 +1,4 @@
-# fmodf.m4 serial 12
+# fmodf.m4 serial 13
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,7 +64,7 @@ AC_DEFUN([gl_FUNC_FMODF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_fmodf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_fmodf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_fmodf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_fmodf_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/fmodl.m4 b/m4/fmodl.m4
index 0096de3bcb..b8a7158d79 100644
--- a/m4/fmodl.m4
+++ b/m4/fmodl.m4
@@ -1,4 +1,4 @@
-# fmodl.m4 serial 12
+# fmodl.m4 serial 13
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -75,7 +75,7 @@ AC_DEFUN([gl_FUNC_FMODL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_fmodl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_fmodl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_fmodl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_fmodl_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/fopen.m4 b/m4/fopen.m4
index 7daa4caec5..ec009c91c2 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,4 +1,4 @@
-# fopen.m4 serial 15
+# fopen.m4 serial 16
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_FOPEN_ITSELF]
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw* | pw*)
+    mingw* | windows* | pw*)
       dnl Replace fopen, for handling of "/dev/null".
       REPLACE_FOPEN=1
       dnl fopen on mingw also has the trailing slash bug.
@@ -136,7 +136,7 @@ AC_DEFUN([gl_FUNC_FOPEN_GNU]
           linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl* | midipix*)
             gl_cv_func_fopen_mode_e="guessing yes" ;;
           # Guess no on native Windows.
-          mingw*)
+          mingw* | windows*)
             gl_cv_func_fopen_mode_e="guessing no" ;;
           # If we don't know, obey --enable-cross-guesses.
           *)
diff --git a/m4/freopen.m4 b/m4/freopen.m4
index 459f8c45fc..94a954ddf0 100644
--- a/m4/freopen.m4
+++ b/m4/freopen.m4
@@ -1,4 +1,4 @@
-# freopen.m4 serial 7
+# freopen.m4 serial 8
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_FREOPEN]
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw* | pw* | os2*)
+    mingw* | windows* | pw* | os2*)
       REPLACE_FREOPEN=1
       ;;
     *)
diff --git a/m4/frexp.m4 b/m4/frexp.m4
index 0480d98f30..d38d1f422b 100644
--- a/m4/frexp.m4
+++ b/m4/frexp.m4
@@ -1,4 +1,4 @@
-# frexp.m4 serial 16
+# frexp.m4 serial 17
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -165,7 +165,14 @@ AC_DEFUN([gl_FUNC_FREXP_WORKS]
         [gl_cv_func_frexp_works=no],
         [case "$host_os" in
            netbsd* | irix*) gl_cv_func_frexp_works="guessing no" ;;
-           mingw*) # Guess yes with MSVC, no with mingw.
+             # Guess yes with MSVC, no with mingw.
+           windows*-gnu*)
+             gl_cv_func_frexp_works="guessing no"
+             ;;
+           windows*-msvc*)
+             gl_cv_func_frexp_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Good], [
 #ifdef _MSC_VER
  Good
diff --git a/m4/frexpf.m4 b/m4/frexpf.m4
index 94a7ef6801..2857dcc875 100644
--- a/m4/frexpf.m4
+++ b/m4/frexpf.m4
@@ -1,4 +1,4 @@
-# frexpf.m4 serial 6
+# frexpf.m4 serial 7
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -89,7 +89,14 @@ AC_DEFUN([gl_FUNC_FREXPF_WORKS]
         [gl_cv_func_frexpf_works=no],
         [case "$host_os" in
            irix*) gl_cv_func_frexpf_works="guessing no" ;;
-           mingw*) # Guess yes with MSVC, no with mingw.
+             # Guess yes with MSVC, no with mingw.
+           windows*-gnu*)
+             gl_cv_func_frexpf_works="guessing no"
+             ;;
+           windows*-msvc*)
+             gl_cv_func_frexpf_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Good], [
 #ifdef _MSC_VER
  Good
diff --git a/m4/frexpl.m4 b/m4/frexpl.m4
index b4cf0ca9ea..eb79aea520 100644
--- a/m4/frexpl.m4
+++ b/m4/frexpl.m4
@@ -1,4 +1,4 @@
-# frexpl.m4 serial 22
+# frexpl.m4 serial 23
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -223,7 +223,7 @@ AC_DEFUN([gl_FUNC_FREXPL_WORKS]
         [
 changequote(,)dnl
          case "$host_os" in
-           aix | aix[3-6]* | beos* | darwin* | irix* | mingw* | pw*)
+           aix | aix[3-6]* | beos* | darwin* | irix* | mingw* | windows* | pw*)
               gl_cv_func_frexpl_works="guessing no";;
            *) gl_cv_func_frexpl_works="guessing yes";;
          esac
diff --git a/m4/fstat.m4 b/m4/fstat.m4
index 7cb2edb001..382741f412 100644
--- a/m4/fstat.m4
+++ b/m4/fstat.m4
@@ -1,4 +1,4 @@
-# fstat.m4 serial 8
+# fstat.m4 serial 9
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_FSTAT]
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
 
   case "$host_os" in
-    mingw* | solaris*)
+    mingw* | windows* | solaris*)
       dnl On MinGW, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
       dnl Solaris stat can return a negative tv_nsec.
diff --git a/m4/ftello.m4 b/m4/ftello.m4
index e13fcd93d2..8efb49d2bb 100644
--- a/m4/ftello.m4
+++ b/m4/ftello.m4
@@ -1,4 +1,4 @@
-# ftello.m4 serial 15
+# ftello.m4 serial 16
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_FTELLO]
       dnl designates a pipe. See also
       dnl 
https://github.com/python/cpython/issues/78961#issuecomment-1093800325
       case "$host_os" in
-        mingw*) REPLACE_FTELLO=1 ;;
+        mingw* | windows*) REPLACE_FTELLO=1 ;;
       esac
     fi
     if test $REPLACE_FTELLO = 0; then
@@ -62,12 +62,12 @@ AC_DEFUN([gl_FUNC_FTELLO]
           dnl be opened.
 changequote(,)dnl
           case "$host_os" in
-                      # Guess no on Solaris.
-            solaris*) gl_cv_func_ftello_works="guessing no" ;;
-                      # Guess yes on native Windows.
-            mingw*)   gl_cv_func_ftello_works="guessing yes" ;;
-                      # Guess yes otherwise.
-            *)        gl_cv_func_ftello_works="guessing yes" ;;
+                               # Guess no on Solaris.
+            solaris*)          gl_cv_func_ftello_works="guessing no" ;;
+                               # Guess yes on native Windows.
+            mingw* | windows*) gl_cv_func_ftello_works="guessing yes" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_ftello_works="guessing yes" ;;
           esac
 changequote([,])dnl
           AC_RUN_IFELSE(
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index cbb5f423de..e362832fb9 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,4 +1,4 @@
-# serial 23
+# serial 24
 
 # See if we need to emulate a missing ftruncate function using _chsize.
 
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_FTRUNCATE]
     m4_ifdef([gl_LARGEFILE], [
       AC_REQUIRE([AC_CANONICAL_HOST])
       case "$host_os" in
-        mingw*)
+        mingw* | windows*)
           dnl Native Windows, and Large File Support is requested.
           dnl The MSVCRT _chsize() function only accepts a 32-bit file size,
           dnl and the mingw64 ftruncate64() function is unreliable (it may
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index e95db056b0..7dda3edc72 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -6,7 +6,7 @@
 # with or without modifications, as long as this notice is preserved.
 
 # Written by Paul Eggert.
-# serial 20
+# serial 21
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
@@ -116,7 +116,7 @@ AC_DEFUN([gl_FUNC_GETCWD]
 
   gl_abort_bug=no
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       gl_cv_func_getcwd_path_max=yes
       ;;
     *)
diff --git a/m4/getlogin.m4 b/m4/getlogin.m4
index 0686b5f079..dc73946205 100644
--- a/m4/getlogin.m4
+++ b/m4/getlogin.m4
@@ -1,4 +1,4 @@
-# getlogin.m4 serial 6
+# getlogin.m4 serial 7
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -23,7 +23,7 @@ AC_DEFUN([gl_LIB_GETLOGIN]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case $host_os in
-    mingw*)
+    mingw* | windows*)
       GETLOGIN_LIB='-ladvapi32' ;;
     *)
       GETLOGIN_LIB= ;;
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 7981a09552..b136ce9537 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 48
+# getopt.m4 serial 49
 dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -197,8 +197,8 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS]
           fi
         else
           case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
+            darwin* | aix* | mingw* | windows*) 
gl_cv_func_getopt_posix="guessing no";;
+            *)                                  
gl_cv_func_getopt_posix="guessing yes";;
           esac
         fi
       ])
diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index 79925a736b..c603f6b59b 100644
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,4 +1,4 @@
-# getpagesize.m4 serial 10
+# getpagesize.m4 serial 11
 dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2023 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE]
     fi
   fi
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       REPLACE_GETPAGESIZE=1
       ;;
   esac
diff --git a/m4/getrandom.m4 b/m4/getrandom.m4
index 7b7f9ce2ee..fd73191b7b 100644
--- a/m4/getrandom.m4
+++ b/m4/getrandom.m4
@@ -1,4 +1,4 @@
-# getrandom.m4 serial 11
+# getrandom.m4 serial 12
 dnl Copyright 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -45,7 +45,7 @@ AC_DEFUN([gl_FUNC_GETRANDOM]
   fi
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_CHECK_HEADERS([bcrypt.h], [], [],
         [[#include <windows.h>
         ]])
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 5051d61cc8..d3ffede638 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,4 +1,4 @@
-# serial 29
+# serial 30
 
 # Copyright (C) 2001-2003, 2005, 2007, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY]
     dnl On mingw, the original gettimeofday has only a precision of 15.6
     dnl milliseconds. So override it.
     case "$host_os" in
-      mingw*) REPLACE_GETTIMEOFDAY=1 ;;
+      mingw* | windows*) REPLACE_GETTIMEOFDAY=1 ;;
     esac
   fi
   AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index c4416c09e9..9b0506cb07 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,4 +1,4 @@
-# serial 12
+# serial 13
 
 # Copyright (C) 2001, 2003-2004, 2006, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -47,7 +47,7 @@ AC_DEFUN([gl_HOST_OS]
        msdosdjgpp*)     os='DJGPP';;
        mpeix*)          os='MPE/iX';;
        mint*)           os='MiNT';;
-       mingw*)          os='MinGW';;
+       mingw* | windows*) os='MinGW';;
        lynxos*)         os='LynxOS';;
        linux*)          os='GNU/Linux';;
        hpux*)           os='HP-UX';;
diff --git a/m4/hypot.m4 b/m4/hypot.m4
index 7a44195784..82e29679bf 100644
--- a/m4/hypot.m4
+++ b/m4/hypot.m4
@@ -1,4 +1,4 @@
-# hypot.m4 serial 10
+# hypot.m4 serial 11
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -60,7 +60,7 @@ AC_DEFUN([gl_FUNC_HYPOT]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_hypot_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_hypot_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_hypot_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_hypot_ieee="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/hypotf.m4 b/m4/hypotf.m4
index 4817a96522..80b83a4c6e 100644
--- a/m4/hypotf.m4
+++ b/m4/hypotf.m4
@@ -1,4 +1,4 @@
-# hypotf.m4 serial 11
+# hypotf.m4 serial 12
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -76,7 +76,7 @@ AC_DEFUN([gl_FUNC_HYPOTF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_hypotf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_hypotf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_hypotf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_hypotf_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -145,7 +145,7 @@ AC_DEFUN([gl_FUNC_HYPOTF_WORKS]
         [case "$host_os" in
            netbsd* | openbsd*) gl_cv_func_hypotf_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_hypotf_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_hypotf_works="guessing yes" ;;
            *)                  gl_cv_func_hypotf_works="guessing yes" ;;
          esac
         ])
diff --git a/m4/hypotl.m4 b/m4/hypotl.m4
index 209bf5ccb1..4296f362f2 100644
--- a/m4/hypotl.m4
+++ b/m4/hypotl.m4
@@ -1,4 +1,4 @@
-# hypotl.m4 serial 12
+# hypotl.m4 serial 13
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -76,7 +76,7 @@ AC_DEFUN([gl_FUNC_HYPOTL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_hypotl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_hypotl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_hypotl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_hypotl_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -176,10 +176,10 @@ AC_DEFUN([gl_FUNC_HYPOTL_WORKS]
         [gl_cv_func_hypotl_works=yes],
         [gl_cv_func_hypotl_works=no],
         [case "$host_os" in
-           openbsd*) gl_cv_func_hypotl_works="guessing no" ;;
-                     # Guess yes on native Windows.
-           mingw*)   gl_cv_func_hypotl_works="guessing yes" ;;
-           *)        gl_cv_func_hypotl_works="guessing yes" ;;
+           openbsd*)          gl_cv_func_hypotl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_hypotl_works="guessing yes" ;;
+           *)                 gl_cv_func_hypotl_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/ilogb.m4 b/m4/ilogb.m4
index e31bd43544..257272bda7 100644
--- a/m4/ilogb.m4
+++ b/m4/ilogb.m4
@@ -1,4 +1,4 @@
-# ilogb.m4 serial 7
+# ilogb.m4 serial 8
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -123,10 +123,11 @@ AC_DEFUN([gl_FUNC_ILOGB_WORKS]
         [gl_cv_func_ilogb_works=no],
         [case "$host_os" in
            aix* | openbsd* | netbsd* | solaris*)
-                   gl_cv_func_ilogb_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_ilogb_works="guessing yes" ;;
-           *)      gl_cv_func_ilogb_works="guessing yes" ;;
+              gl_cv_func_ilogb_works="guessing no" ;;
+              # Guess yes on native Windows.
+           mingw* | windows*)
+              gl_cv_func_ilogb_works="guessing yes" ;;
+           *) gl_cv_func_ilogb_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/ilogbf.m4 b/m4/ilogbf.m4
index a89d28561b..005c35ef85 100644
--- a/m4/ilogbf.m4
+++ b/m4/ilogbf.m4
@@ -1,4 +1,4 @@
-# ilogbf.m4 serial 6
+# ilogbf.m4 serial 7
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -108,10 +108,10 @@ AC_DEFUN([gl_FUNC_ILOGBF_WORKS]
         [gl_cv_func_ilogbf_works=no],
         [case "$host_os" in
            openbsd* | netbsd*)
-                   gl_cv_func_ilogbf_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_ilogbf_works="guessing yes" ;;
-           *)      gl_cv_func_ilogbf_works="guessing yes" ;;
+                              gl_cv_func_ilogbf_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_ilogbf_works="guessing yes" ;;
+           *)                 gl_cv_func_ilogbf_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/ilogbl.m4 b/m4/ilogbl.m4
index b25323e95f..b47c981820 100644
--- a/m4/ilogbl.m4
+++ b/m4/ilogbl.m4
@@ -1,4 +1,4 @@
-# ilogbl.m4 serial 6
+# ilogbl.m4 serial 7
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -159,11 +159,10 @@ AC_DEFUN([gl_FUNC_ILOGBL_WORKS]
         [gl_cv_func_ilogbl_works=yes],
         [gl_cv_func_ilogbl_works=no],
         [case "$host_os" in
-           aix* | haiku*)
-                   gl_cv_func_ilogbl_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_ilogbl_works="guessing yes" ;;
-           *)      gl_cv_func_ilogbl_works="guessing yes" ;;
+           aix* | haiku*)     gl_cv_func_ilogbl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_ilogbl_works="guessing yes" ;;
+           *)                 gl_cv_func_ilogbl_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/isatty.m4 b/m4/isatty.m4
index c073ca4f05..948ed30ec9 100644
--- a/m4/isatty.m4
+++ b/m4/isatty.m4
@@ -1,4 +1,4 @@
-# isatty.m4 serial 3
+# isatty.m4 serial 4
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_ISATTY]
   dnl On native Windows, the system's isatty(), defined as an alias of 
_isatty()
   dnl in the "oldnames" library, returns true for the NUL device.
   case $host_os in
-    mingw*) REPLACE_ISATTY=1 ;;
+    mingw* | windows*) REPLACE_ISATTY=1 ;;
   esac
 ])
 
diff --git a/m4/isfinite.m4 b/m4/isfinite.m4
index 8f18ae8d62..6170890d25 100644
--- a/m4/isfinite.m4
+++ b/m4/isfinite.m4
@@ -1,4 +1,4 @@
-# isfinite.m4 serial 17
+# isfinite.m4 serial 18
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -153,9 +153,9 @@ AC_DEFUN([gl_ISFINITEL_WORKS]
       [gl_cv_func_isfinitel_works=yes],
       [gl_cv_func_isfinitel_works=no],
       [case "$host_os" in
-                 # Guess no on native Windows.
-         mingw*) gl_cv_func_isfinitel_works="guessing no" ;;
-         *)      gl_cv_func_isfinitel_works="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_isfinitel_works="guessing no" ;;
+         *)                 gl_cv_func_isfinitel_works="guessing yes" ;;
        esac
       ])
     ])
diff --git a/m4/isinf.m4 b/m4/isinf.m4
index 2b5ebdf9d4..de27453933 100644
--- a/m4/isinf.m4
+++ b/m4/isinf.m4
@@ -1,4 +1,4 @@
-# isinf.m4 serial 13
+# isinf.m4 serial 14
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -160,7 +160,7 @@ AC_DEFUN([gl_ISINFL_WORKS]
       [gl_cv_func_isinfl_works=yes],
       [gl_cv_func_isinfl_works=no],
       [case "$host_os" in
-         mingw*) # Guess yes on mingw, no on MSVC.
+         mingw* | windows*) # Guess yes on mingw, no on MSVC.
            AC_EGREP_CPP([Known], [
 #ifdef __MINGW32__
  Known
diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index 01f7bbd20d..f96e5e2060 100644
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -1,4 +1,4 @@
-# isnanf.m4 serial 18
+# isnanf.m4 serial 19
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -181,7 +181,7 @@ AC_DEFUN([gl_ISNANF_WORKS]
         [gl_cv_func_isnanf_works=no],
         [case "$host_os" in
            irix* | solaris*) gl_cv_func_isnanf_works="guessing no" ;;
-           mingw*) # Guess yes on mingw, no on MSVC.
+           mingw* | windows*) # Guess yes on mingw, no on MSVC.
              AC_EGREP_CPP([Known], [
 #ifdef __MINGW32__
  Known
diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index bb39d02558..1b1c035665 100644
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -1,4 +1,4 @@
-# isnanl.m4 serial 22
+# isnanl.m4 serial 23
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -232,7 +232,7 @@ AC_DEFUN([gl_FUNC_ISNANL_WORKS]
         [gl_cv_func_isnanl_works=yes],
         [gl_cv_func_isnanl_works=no],
         [case "$host_os" in
-           mingw*) # Guess yes on mingw, no on MSVC.
+           mingw* | windows*) # Guess yes on mingw, no on MSVC.
              AC_EGREP_CPP([Known], [
 #ifdef __MINGW32__
  Known
diff --git a/m4/iswdigit.m4 b/m4/iswdigit.m4
index 54a2943ead..b0572819ce 100644
--- a/m4/iswdigit.m4
+++ b/m4/iswdigit.m4
@@ -1,4 +1,4 @@
-# iswdigit.m4 serial 4
+# iswdigit.m4 serial 5
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,7 +25,7 @@ AC_DEFUN([gl_FUNC_ISWDIGIT]
 changequote(,)dnl
        case "$host_os" in
          # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
-         freebsd* | dragonfly* | netbsd* | solaris* | mingw*)
+         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
            gl_cv_func_iswdigit_works="guessing no" ;;
          # Guess yes otherwise.
          *) gl_cv_func_iswdigit_works="guessing yes" ;;
diff --git a/m4/iswxdigit.m4 b/m4/iswxdigit.m4
index a16b10aed3..7321807bc6 100644
--- a/m4/iswxdigit.m4
+++ b/m4/iswxdigit.m4
@@ -1,4 +1,4 @@
-# iswxdigit.m4 serial 4
+# iswxdigit.m4 serial 5
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT]
 changequote(,)dnl
        case "$host_os" in
          # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
-         freebsd* | dragonfly* | netbsd* | solaris* | mingw*)
+         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
            gl_cv_func_iswxdigit_works="guessing no" ;;
          # Guess yes otherwise.
          *) gl_cv_func_iswxdigit_works="guessing yes" ;;
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 8b051c0042..7e65d72fea 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -247,7 +247,7 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE]
     AC_REQUIRE([AC_CANONICAL_HOST])
     if test $ac_opt_found != yes; then
       AS_CASE([$host_os],
-        [mingw*],
+        [mingw* | windows*],
           [ac_cv_sys_largefile_opts="supported through gnulib"
            ac_opt_found=yes]
       )
@@ -305,7 +305,7 @@ AC_DEFUN([gl_LARGEFILE]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl Native Windows.
       dnl mingw64 defines off_t to a 64-bit type already, if
       dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4
index f2785d67c5..aecd89f49d 100644
--- a/m4/ldexpl.m4
+++ b/m4/ldexpl.m4
@@ -1,4 +1,4 @@
-# ldexpl.m4 serial 17
+# ldexpl.m4 serial 18
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -124,10 +124,10 @@ AC_DEFUN([gl_FUNC_LDEXPL_WORKS]
         [
 changequote(,)dnl
          case "$host_os" in
-           aix | aix[3-6]*) gl_cv_func_ldexpl_works="guessing no" ;;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_ldexpl_works="guessing yes" ;;
-           *)               gl_cv_func_ldexpl_works="guessing yes" ;;
+           aix | aix[3-6]*)   gl_cv_func_ldexpl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_ldexpl_works="guessing yes" ;;
+           *)                 gl_cv_func_ldexpl_works="guessing yes" ;;
          esac
 changequote([,])dnl
         ])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index acc6127435..70ca4a2e1d 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,4 +1,4 @@
-# lib-ld.m4 serial 11
+# lib-ld.m4 serial 12
 dnl Copyright (C) 1996-2003, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -67,7 +67,7 @@ AC_DEFUN([AC_LIB_PROG_LD]
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
diff --git a/m4/locale-ar.m4 b/m4/locale-ar.m4
index 2a7f4918d5..4f1488996b 100644
--- a/m4/locale-ar.m4
+++ b/m4/locale-ar.m4
@@ -1,4 +1,4 @@
-# locale-ar.m4 serial 10
+# locale-ar.m4 serial 11
 dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -69,7 +69,7 @@ AC_DEFUN_ONCE([gt_LOCALE_AR]
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Note that on native Windows, the Arabic locale is
           # "Arabic_Saudi Arabia.1256", and CP1256 is very different from
           # ISO-8859-6, so we cannot use it here.
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 40b13aeaa7..ac1c7217da 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,4 +1,4 @@
-# locale-fr.m4 serial 22
+# locale-fr.m4 serial 23
 dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -86,7 +86,7 @@ AC_DEFUN_ONCE([gt_LOCALE_FR]
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Test for the native Windows locale name.
           if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 
2>/dev/null; then
             gt_cv_locale_fr=French_France.1252
@@ -228,7 +228,7 @@ AC_DEFUN_ONCE([gt_LOCALE_FR_UTF8]
             # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
             # "ja" as "Japanese" or "Japanese_Japan.932",
             # and similar.
-            mingw*)
+            mingw* | windows*)
               # Test for the hypothetical native Windows locale name.
               if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; 
exit) 2>/dev/null; then
                 gt_cv_locale_fr_utf8=French_France.65001
diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index a400b75763..4350010cba 100644
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,4 +1,4 @@
-# locale-ja.m4 serial 17
+# locale-ja.m4 serial 18
 dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,7 @@ AC_DEFUN_ONCE([gt_LOCALE_JA]
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Note that on native Windows, the Japanese locale is
           # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
           # cannot use it here.
diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4
index eb51484ec6..67e77cd879 100644
--- a/m4/locale-tr.m4
+++ b/m4/locale-tr.m4
@@ -1,4 +1,4 @@
-# locale-tr.m4 serial 14
+# locale-tr.m4 serial 15
 dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -83,7 +83,7 @@ AC_DEFUN_ONCE([gt_LOCALE_TR_UTF8]
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Test for the hypothetical native Windows locale name.
           if (LC_ALL=Turkish_Turkey.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 
2>/dev/null; then
             gt_cv_locale_tr_utf8=Turkish_Turkey.65001
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4
index 8cb7b5e519..10a2b5875a 100644
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@@ -1,4 +1,4 @@
-# locale-zh.m4 serial 17
+# locale-zh.m4 serial 18
 dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -91,7 +91,7 @@ AC_DEFUN_ONCE([gt_LOCALE_ZH_CN]
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Test for the hypothetical native Windows locale name.
           if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 
2>/dev/null; then
             gt_cv_locale_zh_CN=Chinese_China.54936
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index a33a0a4661..f7281ac0c8 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 28
+# locale_h.m4 serial 29
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -59,7 +59,12 @@ AC_DEFUN_ONCE([gl_LOCALE_H]
     dnl On native Windows with MSVC, merely define these member names as 
macros.
     dnl This avoids trouble in C++ mode.
     case "$host_os" in
-      mingw*)
+      windows*-gnu*)
+        REPLACE_STRUCT_LCONV=1
+        ;;
+      windows*-msvc*)
+        ;;
+      mingw* | windows*)
         AC_EGREP_CPP([Special], [
 #ifdef _MSC_VER
  Special
diff --git a/m4/localeconv.m4 b/m4/localeconv.m4
index 374dcbf54f..b9d8c1b113 100644
--- a/m4/localeconv.m4
+++ b/m4/localeconv.m4
@@ -1,4 +1,4 @@
-# localeconv.m4 serial 2
+# localeconv.m4 serial 3
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,7 @@ AC_DEFUN([gl_FUNC_LOCALECONV]
                                 # Guess yes on musl systems.
             *-musl* | midipix*) gl_cv_func_localeconv_works="guessing yes" ;;
                                 # Guess no on native Windows.
-            mingw*)             gl_cv_func_localeconv_works="guessing no" ;;
+            mingw* | windows*)  gl_cv_func_localeconv_works="guessing no" ;;
                                 # If we don't know, obey 
--enable-cross-guesses.
             *)                  
gl_cv_func_localeconv_works="$gl_cross_guess_normal" ;;
           esac
diff --git a/m4/localtime.m4 b/m4/localtime.m4
index e74ca7d151..b111ec737e 100644
--- a/m4/localtime.m4
+++ b/m4/localtime.m4
@@ -1,4 +1,4 @@
-# localtime.m4 serial 2
+# localtime.m4 serial 3
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,6 @@ AC_DEFUN([gl_FUNC_LOCALTIME]
   AC_REQUIRE([gl_TIME_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) REPLACE_LOCALTIME=1 ;;
+    mingw* | windows*) REPLACE_LOCALTIME=1 ;;
   esac
 ])
diff --git a/m4/log.m4 b/m4/log.m4
index a0fcc3e465..8c37d4d0a4 100644
--- a/m4/log.m4
+++ b/m4/log.m4
@@ -1,4 +1,4 @@
-# log.m4 serial 12
+# log.m4 serial 13
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_LOG]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_log_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_log_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_log_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_log_ieee="$gl_cross_guess_normal" ;;
              esac
@@ -103,10 +103,10 @@ AC_DEFUN([gl_FUNC_LOG_WORKS]
         [gl_cv_func_log_works=yes],
         [gl_cv_func_log_works=no],
         [case "$host_os" in
-           osf*)   gl_cv_func_log_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_log_works="guessing yes" ;;
-           *)      gl_cv_func_log_works="guessing yes" ;;
+           osf*)              gl_cv_func_log_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log_works="guessing yes" ;;
+           *)                 gl_cv_func_log_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log10.m4 b/m4/log10.m4
index e803a8e6b3..748903e397 100644
--- a/m4/log10.m4
+++ b/m4/log10.m4
@@ -1,4 +1,4 @@
-# log10.m4 serial 12
+# log10.m4 serial 13
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_LOG10]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_log10_ieee="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_log10_ieee="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_log10_ieee="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_log10_ieee="$gl_cross_guess_normal" ;;
              esac
@@ -103,10 +103,10 @@ AC_DEFUN([gl_FUNC_LOG10_WORKS]
         [gl_cv_func_log10_works=yes],
         [gl_cv_func_log10_works=no],
         [case "$host_os" in
-           osf*)   gl_cv_func_log10_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_log10_works="guessing yes" ;;
-           *)      gl_cv_func_log10_works="guessing yes" ;;
+           osf*)              gl_cv_func_log10_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log10_works="guessing yes" ;;
+           *)                 gl_cv_func_log10_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log10f.m4 b/m4/log10f.m4
index 4d44c71dc6..801634c609 100644
--- a/m4/log10f.m4
+++ b/m4/log10f.m4
@@ -1,4 +1,4 @@
-# log10f.m4 serial 13
+# log10f.m4 serial 14
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -73,7 +73,7 @@ AC_DEFUN([gl_FUNC_LOG10F]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log10f_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log10f_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log10f_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log10f_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -127,10 +127,10 @@ AC_DEFUN([gl_FUNC_LOG10F_WORKS]
         [gl_cv_func_log10f_works=yes],
         [gl_cv_func_log10f_works=no],
         [case "$host_os" in
-           osf*)   gl_cv_func_log10f_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_log10f_works="guessing yes" ;;
-           *)      gl_cv_func_log10f_works="guessing yes" ;;
+           osf*)              gl_cv_func_log10f_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log10f_works="guessing yes" ;;
+           *)                 gl_cv_func_log10f_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log10l.m4 b/m4/log10l.m4
index 319c461a5d..3c9caa7cb1 100644
--- a/m4/log10l.m4
+++ b/m4/log10l.m4
@@ -1,4 +1,4 @@
-# log10l.m4 serial 11
+# log10l.m4 serial 12
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -150,7 +150,7 @@ AC_DEFUN([gl_FUNC_LOG10L_WORKS]
                                # Guess no on musl systems.
            *-musl* | midipix*) gl_cv_func_log10l_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_log10l_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_log10l_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_log10l_works="$gl_cross_guess_normal" ;;
          esac
diff --git a/m4/log1p.m4 b/m4/log1p.m4
index 9e06540950..c4c46e51a2 100644
--- a/m4/log1p.m4
+++ b/m4/log1p.m4
@@ -1,4 +1,4 @@
-# log1p.m4 serial 9
+# log1p.m4 serial 10
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_LOG1P]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log1p_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log1p_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log1p_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log1p_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/log1pf.m4 b/m4/log1pf.m4
index 0cb6c7391f..c3625b545e 100644
--- a/m4/log1pf.m4
+++ b/m4/log1pf.m4
@@ -1,4 +1,4 @@
-# log1pf.m4 serial 9
+# log1pf.m4 serial 10
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -66,7 +66,7 @@ AC_DEFUN([gl_FUNC_LOG1PF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log1pf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log1pf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log1pf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log1pf_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -114,10 +114,10 @@ AC_DEFUN([gl_FUNC_LOG1PF_WORKS]
         [gl_cv_func_log1pf_works=yes],
         [gl_cv_func_log1pf_works=no],
         [case "$host_os" in
-           irix*)  gl_cv_func_log1pf_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_log1pf_works="guessing yes" ;;
-           *)      gl_cv_func_log1pf_works="guessing yes" ;;
+           irix*)             gl_cv_func_log1pf_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log1pf_works="guessing yes" ;;
+           *)                 gl_cv_func_log1pf_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log1pl.m4 b/m4/log1pl.m4
index 3519ce8e38..759ef4358e 100644
--- a/m4/log1pl.m4
+++ b/m4/log1pl.m4
@@ -1,4 +1,4 @@
-# log1pl.m4 serial 10
+# log1pl.m4 serial 11
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -67,7 +67,7 @@ AC_DEFUN([gl_FUNC_LOG1PL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log1pl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log1pl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log1pl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log1pl_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -192,7 +192,7 @@ AC_DEFUN([gl_FUNC_LOG1PL_WORKS]
                                # Guess no on musl systems.
            *-musl* | midipix*) gl_cv_func_log1pl_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_log1pl_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_log1pl_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_log1pl_works="$gl_cross_guess_normal" ;;
          esac
diff --git a/m4/log2.m4 b/m4/log2.m4
index 86e39a237c..9cf6d858e4 100644
--- a/m4/log2.m4
+++ b/m4/log2.m4
@@ -1,4 +1,4 @@
-# log2.m4 serial 13
+# log2.m4 serial 14
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -84,7 +84,7 @@ AC_DEFUN([gl_FUNC_LOG2]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log2_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log2_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log2_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log2_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -168,10 +168,10 @@ AC_DEFUN([gl_FUNC_LOG2_WORKS]
         [gl_cv_func_log2_works=yes],
         [gl_cv_func_log2_works=no],
         [case "$host_os" in
-           cygwin* | osf*) gl_cv_func_log2_works="guessing no" ;;
-                           # Guess yes on native Windows.
-           mingw*)         gl_cv_func_log2_works="guessing yes" ;;
-           *)              gl_cv_func_log2_works="guessing yes" ;;
+           cygwin* | osf*)    gl_cv_func_log2_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log2_works="guessing yes" ;;
+           *)                 gl_cv_func_log2_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log2f.m4 b/m4/log2f.m4
index 112cd8fcb9..f0dc20eb3e 100644
--- a/m4/log2f.m4
+++ b/m4/log2f.m4
@@ -1,4 +1,4 @@
-# log2f.m4 serial 13
+# log2f.m4 serial 14
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -85,7 +85,7 @@ AC_DEFUN([gl_FUNC_LOG2F]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_log2f_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_log2f_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_log2f_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_log2f_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -175,10 +175,10 @@ AC_DEFUN([gl_FUNC_LOG2F_WORKS]
         [gl_cv_func_log2f_works=yes],
         [gl_cv_func_log2f_works=no],
         [case "$host_os" in
-           cygwin* | osf*) gl_cv_func_log2f_works="guessing no" ;;
-                           # Guess yes on native Windows.
-           mingw*)         gl_cv_func_log2f_works="guessing yes" ;;
-           *)              gl_cv_func_log2f_works="guessing yes" ;;
+           cygwin* | osf*)    gl_cv_func_log2f_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_log2f_works="guessing yes" ;;
+           *)                 gl_cv_func_log2f_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/log2l.m4 b/m4/log2l.m4
index 5fede3f067..f4d9983bf6 100644
--- a/m4/log2l.m4
+++ b/m4/log2l.m4
@@ -1,4 +1,4 @@
-# log2l.m4 serial 6
+# log2l.m4 serial 7
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -172,7 +172,7 @@ AC_DEFUN([gl_FUNC_LOG2L_WORKS]
                                # Guess no on OSF/1.
            osf*)               gl_cv_func_log2l_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_log2l_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_log2l_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  gl_cv_func_log2l_works="$gl_cross_guess_normal" 
;;
          esac
diff --git a/m4/logb.m4 b/m4/logb.m4
index 94ce725175..8a4ad0d449 100644
--- a/m4/logb.m4
+++ b/m4/logb.m4
@@ -1,4 +1,4 @@
-# logb.m4 serial 9
+# logb.m4 serial 10
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -134,7 +134,14 @@ AC_DEFUN([gl_FUNC_LOGB_WORKS]
         [gl_cv_func_logb_works=no],
         [case "$host_os" in
            *gnu* | solaris* | cygwin*) gl_cv_func_logb_works="guessing no" ;;
-           mingw*) # Guess yes on MSVC, no on mingw.
+           # Guess yes on MSVC, no on mingw.
+           windows*-gnu*)
+             gl_cv_func_logb_works="guessing no"
+             ;;
+           windows*-msvc*)
+             gl_cv_func_logb_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
diff --git a/m4/logbf.m4 b/m4/logbf.m4
index fcb7f46763..10fadaf11c 100644
--- a/m4/logbf.m4
+++ b/m4/logbf.m4
@@ -1,4 +1,4 @@
-# logbf.m4 serial 3
+# logbf.m4 serial 4
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -75,7 +75,14 @@ AC_DEFUN([gl_FUNC_LOGBF_WORKS]
         [gl_cv_func_logbf_works=no],
         [case "$host_os" in
            *gnu* | solaris*) gl_cv_func_logbf_works="guessing no" ;;
-           mingw*) # Guess yes on MSVC, no on mingw.
+           # Guess yes on MSVC, no on mingw.
+           windows*-gnu*)
+             gl_cv_func_logbf_works="guessing no"
+             ;;
+           windows*-msvc*)
+             gl_cv_func_logbf_works="guessing yes"
+             ;;
+           mingw* | windows*)
              AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
diff --git a/m4/logbl.m4 b/m4/logbl.m4
index ef38e80ba3..74884a1ad8 100644
--- a/m4/logbl.m4
+++ b/m4/logbl.m4
@@ -1,4 +1,4 @@
-# logbl.m4 serial 5
+# logbl.m4 serial 6
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -108,10 +108,10 @@ AC_DEFUN([gl_FUNC_LOGBL_WORKS]
         [gl_cv_func_logbl_works=yes],
         [gl_cv_func_logbl_works=no],
         [case "$host_os" in
-           *gnu* | solaris*) gl_cv_func_logbl_works="guessing no" ;;
-                             # Guess yes on native Windows.
-           mingw*)           gl_cv_func_logbl_works="guessing yes" ;;
-           *)                gl_cv_func_logbl_works="guessing yes" ;;
+           *gnu* | solaris*)  gl_cv_func_logbl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_logbl_works="guessing yes" ;;
+           *)                 gl_cv_func_logbl_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/logf.m4 b/m4/logf.m4
index d9fe5fdc71..6747ce1c04 100644
--- a/m4/logf.m4
+++ b/m4/logf.m4
@@ -1,4 +1,4 @@
-# logf.m4 serial 13
+# logf.m4 serial 14
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -73,7 +73,7 @@ AC_DEFUN([gl_FUNC_LOGF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_logf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_logf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_logf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_logf_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -127,10 +127,10 @@ AC_DEFUN([gl_FUNC_LOGF_WORKS]
         [gl_cv_func_logf_works=yes],
         [gl_cv_func_logf_works=no],
         [case "$host_os" in
-           osf*)   gl_cv_func_logf_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_logf_works="guessing yes" ;;
-           *)      gl_cv_func_logf_works="guessing yes" ;;
+           osf*)              gl_cv_func_logf_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_logf_works="guessing yes" ;;
+           *)                 gl_cv_func_logf_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/logl.m4 b/m4/logl.m4
index cc50f4d4d1..0b33a596e3 100644
--- a/m4/logl.m4
+++ b/m4/logl.m4
@@ -1,4 +1,4 @@
-# logl.m4 serial 16
+# logl.m4 serial 17
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -191,7 +191,7 @@ AC_DEFUN([gl_FUNC_LOGL_WORKS]
                                # Guess no on musl systems.
            *-musl* | midipix*) gl_cv_func_logl_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_logl_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_logl_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  gl_cv_func_logl_works="$gl_cross_guess_normal" 
;;
          esac
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index 0da458804f..e8e0bb8bd9 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -1,4 +1,4 @@
-# lseek.m4 serial 14
+# lseek.m4 serial 15
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_LSEEK]
   AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether lseek detects pipes], [gl_cv_func_lseek_pipe],
     [case "$host_os" in
-       mingw*)
+       mingw* | windows*)
          dnl Native Windows.
          dnl The result of lseek (fd, (off_t)0, SEEK_CUR) or
          dnl SetFilePointer(handle, 0, NULL, FILE_CURRENT)
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 2bc4669793..977386348a 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-# serial 34
+# serial 35
 
 # Copyright (C) 1997-2001, 2003-2023 Free Software Foundation, Inc.
 #
@@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]
           *-gnu* | gnu*)
             # Guess yes on glibc systems.
             gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-          mingw*)
+          mingw* | windows*)
             # Guess no on native Windows.
             gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
           *)
diff --git a/m4/malloc-align.m4 b/m4/malloc-align.m4
index 0bbe1d95be..961a6a8673 100644
--- a/m4/malloc-align.m4
+++ b/m4/malloc-align.m4
@@ -1,4 +1,4 @@
-# malloc-align.m4 serial 2
+# malloc-align.m4 serial 3
 dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -84,7 +84,7 @@ AC_DEFUN([gl_MALLOC_ALIGNMENT]
         dnl a smaller value (e.g. 4 instead of 8 or 16).
         gl_cv_malloc_alignment="unknown"
         case "$host_os" in
-          linux* | mingw*)
+          linux* | mingw* | windows*)
             dnl On Linux:
             dnl - It's 8 on most 32-bit platforms, except 16 on x86_64-x32 and
             dnl   (with newer versions of glibc) on i386 and powerpc.  8 is a
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index bc580176f5..096c262b17 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-# malloc.m4 serial 29
+# malloc.m4 serial 30
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,7 +26,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF]
           # Guess yes on platforms where we know the result.
           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
           | gnu* | *-musl* | midipix* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
+          | hpux* | solaris* | cygwin* | mingw* | windows* | msys* )
             ac_cv_func_malloc_0_nonnull="guessing yes" ;;
           # If we don't know, obey --enable-cross-guesses.
           *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
@@ -128,7 +128,7 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX]
       dnl except on those platforms where we have seen 'test-malloc-gnu',
       dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
       case "$host_os" in
-        mingw*)
+        mingw* | windows*)
           gl_cv_func_malloc_posix=no ;;
         irix* | solaris*)
           dnl On IRIX 6.5, the three functions return NULL with errno unset
diff --git a/m4/mbrtoc16.m4 b/m4/mbrtoc16.m4
index ceb8802a57..85bde5219d 100644
--- a/m4/mbrtoc16.m4
+++ b/m4/mbrtoc16.m4
@@ -1,4 +1,4 @@
-# mbrtoc16.m4 serial 1
+# mbrtoc16.m4 serial 2
 dnl Copyright (C) 2014-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -138,12 +138,12 @@ AC_DEFUN([gl_MBRTOC16_RETVAL]
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                         # Guess no on Android.
-        linux*-android*) gl_cv_func_mbrtoc16_retval="guessing no" ;;
-                         # Guess no on native Windows.
-        mingw*)          gl_cv_func_mbrtoc16_retval="guessing no" ;;
-                         # Guess yes otherwise.
-        *)               gl_cv_func_mbrtoc16_retval="guessing yes" ;;
+                           # Guess no on Android.
+        linux*-android*)   gl_cv_func_mbrtoc16_retval="guessing no" ;;
+                           # Guess no on native Windows.
+        mingw* | windows*) gl_cv_func_mbrtoc16_retval="guessing no" ;;
+                           # Guess yes otherwise.
+        *)                 gl_cv_func_mbrtoc16_retval="guessing yes" ;;
       esac
 changequote([,])dnl
       AC_RUN_IFELSE(
@@ -301,9 +301,9 @@ AC_DEFUN([gl_MBRTOC16_C_LOCALE]
        [gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ=yes],
        [gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ=no],
        [case "$host_os" in
-                  # Guess yes on native Windows.
-          mingw*) gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ="guessing yes" ;;
-          *)      
gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) 
gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ="guessing yes" ;;
+          *)                 
gl_cv_func_mbrtoc16_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
         esac
        ])
     ])
@@ -331,7 +331,7 @@ AC_DEFUN([gl_MBRTOC16_SANITYCHECK]
 changequote(,)dnl
         case "$host_os" in
           # Guess no on FreeBSD, Solaris, native Windows.
-          freebsd* | midnightbsd* | solaris* | mingw*)
+          freebsd* | midnightbsd* | solaris* | mingw* | windows*)
             gl_cv_func_mbrtoc16_sanitycheck="guessing no"
             ;;
           # Guess yes otherwise.
diff --git a/m4/mbrtoc32.m4 b/m4/mbrtoc32.m4
index 25196039bb..361c9f8380 100644
--- a/m4/mbrtoc32.m4
+++ b/m4/mbrtoc32.m4
@@ -1,4 +1,4 @@
-# mbrtoc32.m4 serial 17
+# mbrtoc32.m4 serial 18
 dnl Copyright (C) 2014-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -105,13 +105,13 @@ AC_DEFUN([gl_MBRTOC32_EMPTY_INPUT]
         [gl_cv_func_mbrtoc32_empty_input=yes],
         [gl_cv_func_mbrtoc32_empty_input=no],
         [case "$host_os" in
-                            # Guess no on glibc systems.
-           *-gnu* | gnu*)   gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
-                            # Guess no on native Windows.
-           mingw*)          gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
-           *)               gl_cv_func_mbrtoc32_empty_input="guessing yes" ;;
+                              # Guess no on glibc systems.
+           *-gnu* | gnu*)     gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+           *)                 gl_cv_func_mbrtoc32_empty_input="guessing yes" ;;
          esac
         ])
     ])
@@ -154,9 +154,9 @@ AC_DEFUN([gl_MBRTOC32_C_LOCALE]
        [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=yes],
        [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=no],
        [case "$host_os" in
-                  # Guess yes on native Windows.
-          mingw*) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="guessing yes" ;;
-          *)      
gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) 
gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="guessing yes" ;;
+          *)                 
gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
         esac
        ])
     ])
@@ -184,7 +184,7 @@ AC_DEFUN([gl_MBRTOC32_SANITYCHECK]
 changequote(,)dnl
         case "$host_os" in
           # Guess no on FreeBSD, Solaris, native Windows.
-          freebsd* | midnightbsd* | solaris* | mingw*)
+          freebsd* | midnightbsd* | solaris* | mingw* | windows*)
             gl_cv_func_mbrtoc32_sanitycheck="guessing no"
             ;;
           # Guess yes otherwise.
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 430e9ad832..ea0789510f 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 43  -*- coding: utf-8 -*-
+# mbrtowc.m4 serial 44  -*- coding: utf-8 -*-
 dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -91,7 +91,9 @@ AC_DEFUN([gl_FUNC_MBRTOWC]
   fi
   if test $REPLACE_MBSTATE_T = 1; then
     case "$host_os" in
-      mingw*) MBRTOWC_LIB= ;;
+      mingw* | windows*)
+        MBRTOWC_LIB=
+        ;;
       *)
         gl_WEAK_SYMBOLS
         case "$gl_cv_have_weak" in
@@ -129,7 +131,7 @@ AC_DEFUN_ONCE([gl_MBSTATE_T_BROKEN]
   dnl to override it, even if - like on MSVC - mbsinit() is only defined as
   dnl an inline function, not as a global function.
   if case "$host_os" in
-       mingw*) true ;;
+       mingw* | windows*) true ;;
        *) test $ac_cv_func_mbsinit = yes ;;
      esac \
     && test $ac_cv_func_mbrtowc = yes; then
@@ -411,14 +413,16 @@ AC_DEFUN([gl_MBRTOWC_RETVAL]
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native 
Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+          # Guess no on HP-UX, Solaris, native Windows.
+        hpux* | solaris* | mingw* | windows*)
+          gl_cv_func_mbrtowc_retval="guessing no" ;;
+          # Guess yes otherwise.
+        *)
+          gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
+         || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; 
then
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -582,13 +586,13 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE]
      dnl is present.
 changequote(,)dnl
      case "$host_os" in
-               # Guess yes on native Windows.
-       mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;;
-       *)      gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;;
+                          # Guess yes on native Windows.
+       mingw* | windows*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" 
;;
+       *)                 gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;;
      esac
 changequote([,])dnl
      case "$host_os" in
-       mingw*)
+       mingw* | windows*)
          AC_RUN_IFELSE(
            [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -700,7 +704,7 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT]
                                 # Guess no on Android.
           linux*-android*)      gl_cv_func_mbrtowc_empty_input="guessing no" ;;
                                 # Guess no on native Windows.
-          mingw*)               gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+          mingw* | windows*)    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
           *)                    gl_cv_func_mbrtowc_empty_input="guessing yes" 
;;
         esac
        ])
@@ -745,9 +749,9 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE]
        [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes],
        [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no],
        [case "$host_os" in
-                  # Guess yes on native Windows.
-          mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;;
-          *)      
gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing 
yes" ;;
+          *)                 
gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
         esac
        ])
     ])
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index c388a8b9a1..8d10569f64 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,4 +1,4 @@
-# mbsinit.m4 serial 9
+# mbsinit.m4 serial 10
 dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_MBSINIT]
       dnl states produced by mbrtowc() for an incomplete multibyte character
       dnl in multibyte locales.
       case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
+        mingw* | windows*) REPLACE_MBSINIT=1 ;;
       esac
     fi
   fi
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 720f727f95..db78ee0edc 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,4 +1,4 @@
-# mbsrtowcs.m4 serial 16
+# mbsrtowcs.m4 serial 17
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,10 +61,12 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS]
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, mingw.
-        hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbsrtowcs_works="guessing yes" ;;
+          # Guess no on HP-UX, Solaris, mingw.
+        hpux* | solaris* | mingw* | windows*)
+          gl_cv_func_mbsrtowcs_works="guessing no" ;;
+          # Guess yes otherwise.
+        *)
+          gl_cv_func_mbsrtowcs_works="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test 
$LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 4f1aed0167..1523f19e09 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,4 +1,4 @@
-# memchr.m4 serial 18
+# memchr.m4 serial 19
 dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -85,12 +85,12 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR]
        [gl_cv_func_memchr_works=yes],
        [gl_cv_func_memchr_works=no],
        [case "$host_os" in
-                           # Guess no on Android.
-          linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
-                           # Guess yes on native Windows.
-          mingw*)          gl_cv_func_memchr_works="guessing yes" ;;
-                           # If we don't know, obey --enable-cross-guesses.
-          *)               gl_cv_func_memchr_works="$gl_cross_guess_normal" ;;
+                             # Guess no on Android.
+          linux*-android*)   gl_cv_func_memchr_works="guessing no" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_memchr_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 gl_cv_func_memchr_works="$gl_cross_guess_normal" 
;;
         esac
        ])
     ])
diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
index c2bc4da7ca..79c5e2c740 100644
--- a/m4/mkdir.m4
+++ b/m4/mkdir.m4
@@ -1,4 +1,4 @@
-# serial 18
+# serial 19
 
 # Copyright (C) 2001, 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -25,23 +25,25 @@ AC_DEFUN([gl_FUNC_MKDIR]
        [gl_cv_func_mkdir_trailing_slash_works=yes],
        [gl_cv_func_mkdir_trailing_slash_works=no],
        [case "$host_os" in
-                           # Guess yes on Linux systems.
-          linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
-                           # Guess yes on systems that emulate the Linux 
system calls.
-          midipix*)        gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
-                           # Guess yes on glibc systems.
-          *-gnu* | gnu*)   gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
-                           # Guess yes on MSVC, no on mingw.
-          mingw*)          AC_EGREP_CPP([Known], [
+                             # Guess yes on Linux systems.
+          linux-* | linux)   gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
+                             # Guess yes on systems that emulate the Linux 
system calls.
+          midipix*)          gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
+                             # Guess yes on glibc systems.
+          *-gnu* | gnu*)     gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
+                             # Guess yes on MSVC, no on mingw.
+          windows*-gnu*)     gl_cv_func_mkdir_trailing_slash_works="guessing 
no" ;;
+          windows*-msvc*)    gl_cv_func_mkdir_trailing_slash_works="guessing 
yes" ;;
+          mingw* | windows*) AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
-                             ],
-                             [gl_cv_func_mkdir_trailing_slash_works="guessing 
yes"],
-                             [gl_cv_func_mkdir_trailing_slash_works="guessing 
no"])
-                           ;;
-                           # If we don't know, obey --enable-cross-guesses.
-          *)               
gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;;
+                               ],
+                               
[gl_cv_func_mkdir_trailing_slash_works="guessing yes"],
+                               
[gl_cv_func_mkdir_trailing_slash_works="guessing no"])
+                             ;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 
gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;;
         esac
        ])
      rm -rf conftest.dir
@@ -65,16 +67,16 @@ AC_DEFUN([gl_FUNC_MKDIR]
        [gl_cv_func_mkdir_trailing_dot_works=yes],
        [gl_cv_func_mkdir_trailing_dot_works=no],
        [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-                         # Guess yes on musl systems.
-          *-musl*)       gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-                         # Guess yes on systems that emulate the Linux system 
calls.
-          midipix*)      gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-                         # Guess no on native Windows.
-          mingw*)        gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
-                         # If we don't know, obey --enable-cross-guesses.
-          *)             
gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on glibc systems.
+          *-gnu* | gnu*)     gl_cv_func_mkdir_trailing_dot_works="guessing 
yes" ;;
+                             # Guess yes on musl systems.
+          *-musl*)           gl_cv_func_mkdir_trailing_dot_works="guessing 
yes" ;;
+                             # Guess yes on systems that emulate the Linux 
system calls.
+          midipix*)          gl_cv_func_mkdir_trailing_dot_works="guessing 
yes" ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) gl_cv_func_mkdir_trailing_dot_works="guessing no" 
;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 
gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;;
         esac
        ])
      rm -rf conftest.dir
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index d4a15ead33..40958a72c4 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,4 +1,4 @@
-#serial 29
+#serial 30
 
 # Copyright (C) 2001, 2003-2007, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_MKSTEMP]
                                  # Guess yes on musl systems.
              *-musl* | midipix*) gl_cv_func_working_mkstemp="guessing yes" ;;
                                  # Guess no on native Windows.
-             mingw*)             gl_cv_func_working_mkstemp="guessing no" ;;
+             mingw* | windows*)  gl_cv_func_working_mkstemp="guessing no" ;;
                                  # If we don't know, obey 
--enable-cross-guesses.
              *)                  
gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;;
            esac
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 69cce86da5..cdb60cea50 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,4 +1,4 @@
-# serial 38
+# serial 39
 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -264,9 +264,9 @@ AC_DEFUN([gl_FUNC_MKTIME_WORKS]
          [gl_cv_func_working_mktime=yes],
          [gl_cv_func_working_mktime=no],
          [case "$host_os" in
-                    # Guess no on native Windows.
-            mingw*) gl_cv_func_working_mktime="guessing no" ;;
-            *)      gl_cv_func_working_mktime="$gl_cross_guess_normal" ;;
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_working_mktime="guessing no" ;;
+            *)                 
gl_cv_func_working_mktime="$gl_cross_guess_normal" ;;
           esac
          ])
      fi
@@ -287,7 +287,7 @@ AC_DEFUN([gl_FUNC_MKTIME]
        with the algorithmic workarounds.])
   fi
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       REPLACE_MKTIME=1
       AC_DEFINE([NEED_MKTIME_WINDOWS], [1],
         [Define if the compilation of mktime.c should define 'mktime'
diff --git a/m4/modf.m4 b/m4/modf.m4
index 90671d1370..7ed6e4f357 100644
--- a/m4/modf.m4
+++ b/m4/modf.m4
@@ -1,4 +1,4 @@
-# modf.m4 serial 10
+# modf.m4 serial 11
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -66,7 +66,9 @@ AC_DEFUN([gl_FUNC_MODF]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_modf_ieee="guessing yes" ;;
                                    # Guess yes on MSVC, no on mingw.
-               mingw*)             AC_EGREP_CPP([Known], [
+               windows*-gnu*)      gl_cv_func_modf_ieee="guessing no" ;;
+               windows*-msvc*)     gl_cv_func_modf_ieee="guessing yes" ;;
+               mingw* | windows*)  AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
diff --git a/m4/modff.m4 b/m4/modff.m4
index 555bf46634..36752fdd28 100644
--- a/m4/modff.m4
+++ b/m4/modff.m4
@@ -1,4 +1,4 @@
-# modff.m4 serial 12
+# modff.m4 serial 13
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -74,7 +74,9 @@ AC_DEFUN([gl_FUNC_MODFF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_modff_ieee="guessing yes" ;;
                                      # Guess yes on MSVC, no on mingw.
-                 mingw*)             AC_EGREP_CPP([Known], [
+                 windows*-gnu*)      gl_cv_func_modff_ieee="guessing no" ;;
+                 windows*-msvc*)     gl_cv_func_modff_ieee="guessing yes" ;;
+                 mingw* | windows*)  AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
diff --git a/m4/modfl.m4 b/m4/modfl.m4
index 46f55bd911..ddefb07f68 100644
--- a/m4/modfl.m4
+++ b/m4/modfl.m4
@@ -1,4 +1,4 @@
-# modfl.m4 serial 9
+# modfl.m4 serial 10
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -68,7 +68,9 @@ AC_DEFUN([gl_FUNC_MODFL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_modfl_ieee="guessing yes" ;;
                                      # Guess yes on MSVC, no on mingw.
-                 mingw*)             AC_EGREP_CPP([Known], [
+                 windows*-gnu*)      gl_cv_func_modfl_ieee="guessing no" ;;
+                 windows*-msvc*)     gl_cv_func_modfl_ieee="guessing yes" ;;
+                 mingw* | windows*)  AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
diff --git a/m4/mprotect.m4 b/m4/mprotect.m4
index 5e3412e246..f1aa4ba5c9 100644
--- a/m4/mprotect.m4
+++ b/m4/mprotect.m4
@@ -1,4 +1,4 @@
-# mprotect.m4 serial 2
+# mprotect.m4 serial 3
 dnl Copyright (C) 1993-2023 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License as published by the Free Software Foundation;
@@ -144,7 +144,7 @@ AC_DEFUN([gl_FUNC_MPROTECT_WORKS]
            darwin* | freebsd* | dragonfly* | midnightbsd* | netbsd* | openbsd* 
| \
            aix* | hpux* | irix* | solaris* | cygwin*)
              gl_cv_func_mprotect_works="guessing yes" ;;
-           mingw*)
+           mingw* | windows*)
              gl_cv_func_mprotect_works="guessing no" ;;
            *)
              dnl If we don't know, obey --enable-cross-guesses.
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index b7f22d7b60..63fe220037 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 44
+# serial 45
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -116,11 +116,14 @@ AC_DEFUN([gl_FUNC_NANOSLEEP]
         *)     gl_cv_func_nanosleep=no ;;
         esac],
        [case "$host_os" in
-          linux*) # Guess it halfway works when the kernel is Linux.
+            # Guess it halfway works when the kernel is Linux.
+          linux*)
             gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;;
-          mingw*) # Guess no on native Windows.
+            # Guess no on native Windows.
+          mingw* | windows*)
             gl_cv_func_nanosleep='guessing no' ;;
-          *)      # If we don't know, obey --enable-cross-guesses.
+            # If we don't know, obey --enable-cross-guesses.
+          *)
             gl_cv_func_nanosleep="$gl_cross_guess_normal" ;;
         esac
        ])
diff --git a/m4/nonblocking.m4 b/m4/nonblocking.m4
index f63d2aef4c..3654b71d9d 100644
--- a/m4/nonblocking.m4
+++ b/m4/nonblocking.m4
@@ -1,4 +1,4 @@
-# nonblocking.m4 serial 3
+# nonblocking.m4 serial 4
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,11 +19,11 @@ AC_DEFUN([gl_NONBLOCKING_IO_BODY]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) gl_cv_have_nonblocking=no ;;
-    *)      gl_cv_have_nonblocking=yes ;;
+    mingw* | windows*) gl_cv_have_nonblocking=no ;;
+    *)                 gl_cv_have_nonblocking=yes ;;
   esac
   case "$host_os" in
-    mingw*) gl_cv_have_open_O_NONBLOCK=no ;;
-    *)      gl_cv_have_open_O_NONBLOCK=yes ;;
+    mingw* | windows*) gl_cv_have_open_O_NONBLOCK=no ;;
+    *)                 gl_cv_have_open_O_NONBLOCK=yes ;;
   esac
 ])
diff --git a/m4/open.m4 b/m4/open.m4
index 94fa2bb753..b14fd013fc 100644
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,4 +1,4 @@
-# open.m4 serial 15
+# open.m4 serial 16
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_OPEN]
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PREPROC_O_CLOEXEC])
   case "$host_os" in
-    mingw* | pw*)
+    mingw* | windows* | pw*)
       REPLACE_OPEN=1
       ;;
     *)
diff --git a/m4/perror.m4 b/m4/perror.m4
index 9842b24c8e..f5bfbff3cd 100644
--- a/m4/perror.m4
+++ b/m4/perror.m4
@@ -1,4 +1,4 @@
-# perror.m4 serial 12
+# perror.m4 serial 13
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([gl_FUNC_PERROR]
                                   # Guess yes on musl systems.
               *-musl* | midipix*) gl_cv_func_perror_works="guessing yes" ;;
                                   # Guess yes on native Windows.
-              mingw*)             gl_cv_func_perror_works="guessing yes" ;;
+              mingw* | windows*)  gl_cv_func_perror_works="guessing yes" ;;
                                   # Otherwise obey --enable-cross-guesses.
               *)                  
gl_cv_func_perror_works="$gl_cross_guess_normal" ;;
             esac
diff --git a/m4/poll.m4 b/m4/poll.m4
index cfadbf24fd..9aa8c42834 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 21
+# poll.m4 serial 22
 dnl Copyright (c) 2003, 2005-2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -79,7 +79,7 @@ AC_DEFUN([gl_FUNC_POLL]
   POLL_LIB="$LIBSOCKET"
   if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         dnl On the MSVC platform, the function MsgWaitForMultipleObjects
         dnl (used in lib/poll.c) requires linking with -luser32. On mingw,
         dnl it is implicit.
diff --git a/m4/popen.m4 b/m4/popen.m4
index e546548a46..56d1d9a9fc 100644
--- a/m4/popen.m4
+++ b/m4/popen.m4
@@ -1,4 +1,4 @@
-# popen.m4 serial 6
+# popen.m4 serial 7
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,11 +32,11 @@ AC_DEFUN([gl_FUNC_POPEN]
           [gl_cv_func_popen_works=yes],
           [gl_cv_func_popen_works=no],
           [case "$host_os" in
-                      # For now, only cygwin 1.5 or older is known to be 
broken.
-             cygwin*) gl_cv_func_popen_works="guessing no" ;;
-                      # Guess yes on native Windows.
-             mingw*)  gl_cv_func_popen_works="guessing yes" ;;
-             *)       gl_cv_func_popen_works="guessing yes" ;;
+                                # For now, only cygwin 1.5 or older is known 
to be broken.
+             cygwin*)           gl_cv_func_popen_works="guessing no" ;;
+                                # Guess yes on native Windows.
+             mingw* | windows*) gl_cv_func_popen_works="guessing yes" ;;
+             *)                 gl_cv_func_popen_works="guessing yes" ;;
            esac
           ])
       ])
diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4
index 0a0dfe7685..63e3b7a8e2 100644
--- a/m4/posix_spawn.m4
+++ b/m4/posix_spawn.m4
@@ -1,4 +1,4 @@
-# posix_spawn.m4 serial 23
+# posix_spawn.m4 serial 24
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -588,7 +588,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE]
             *-musl* | midipix*) 
gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;;
             solaris*)           
gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;;
                                 # Guess no on native Windows.
-            mingw*)             
gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;;
+            mingw* | windows*)  
gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;;
             *)                  
gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;;
           esac
          ])
@@ -632,7 +632,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2]
             *-musl* | midipix*) 
gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
             solaris*)           
gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
                                 # Guess no on native Windows.
-            mingw*)             
gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;;
+            mingw* | windows*)  
gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;;
             *)                  
gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
           esac
          ])
@@ -678,7 +678,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN]
             *-musl* | midipix*) 
gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
             solaris*)           
gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
                                 # Guess no on native Windows.
-            mingw*)             
gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;;
+            mingw* | windows*)  
gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;;
             *)                  
gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
           esac
          ])
diff --git a/m4/printf.m4 b/m4/printf.m4
index 8b8f01067f..3be48277a6 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 84
+# printf.m4 serial 85
 dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -86,7 +86,9 @@ AC_DEFUN([gl_PRINTF_SIZES_C99]
            linux*-android*)      gl_cv_func_printf_sizes_c99="guessing yes";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-gnu*)        gl_cv_func_printf_sizes_c99="guessing no" ;;
+           windows*-msvc*)       gl_cv_func_printf_sizes_c99="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -179,7 +181,7 @@ AC_DEFUN([gl_PRINTF_SIZES_C23]
                                # Guess no on Android.
            linux*-android*)    gl_cv_func_printf_sizes_c23="guessing no";;
                                # Guess no on native Windows.
-           mingw*)             gl_cv_func_printf_sizes_c23="guessing no";;
+           mingw* | windows*)  gl_cv_func_printf_sizes_c23="guessing no";;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_printf_sizes_c23="$gl_cross_guess_normal";;
          esac
@@ -223,20 +225,22 @@ AC_DEFUN([gl_PRINTF_LONG_DOUBLE]
         [gl_cv_func_printf_long_double=yes],
         [gl_cv_func_printf_long_double=no],
         [case "$host_os" in
-                            # Guess no on BeOS.
-           beos*)           gl_cv_func_printf_long_double="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_long_double="guessing yes";;
-                            # Guess yes on MSVC, no on mingw.
-           mingw*)          AC_EGREP_CPP([Known], [
+                              # Guess no on BeOS.
+           beos*)             gl_cv_func_printf_long_double="guessing no";;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_printf_long_double="guessing yes";;
+                              # Guess yes on MSVC, no on mingw.
+           windows*-gnu*)     gl_cv_func_printf_long_double="guessing no" ;;
+           windows*-msvc*)    gl_cv_func_printf_long_double="guessing yes" ;;
+           mingw* | windows*) AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
-                              ],
-                              [gl_cv_func_printf_long_double="guessing yes"],
-                              [gl_cv_func_printf_long_double="guessing no"])
-                            ;;
-           *)               gl_cv_func_printf_long_double="guessing yes";;
+                                ],
+                                [gl_cv_func_printf_long_double="guessing yes"],
+                                [gl_cv_func_printf_long_double="guessing no"])
+                              ;;
+           *)                 gl_cv_func_printf_long_double="guessing yes";;
          esac
         ])
     ])
@@ -354,7 +358,9 @@ AC_DEFUN([gl_PRINTF_INFINITE]
            linux*-android*)      gl_cv_func_printf_infinite="guessing no";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-gnu*)        gl_cv_func_printf_infinite="guessing no" ;;
+           windows*-msvc*)       gl_cv_func_printf_infinite="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -568,7 +574,9 @@ AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE]
                    linux*-android*)      
gl_cv_func_printf_infinite_long_double="guessing no";;
 changequote([,])dnl
                                          # Guess yes on MSVC, no on mingw.
-                   mingw*)               AC_EGREP_CPP([Known], [
+                   windows*-gnu*)        
gl_cv_func_printf_infinite_long_double="guessing no" ;;
+                   windows*-msvc*)       
gl_cv_func_printf_infinite_long_double="guessing yes" ;;
+                   mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -681,7 +689,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_A]
                                  # Guess no on Android.
            linux*-android*)      gl_cv_func_printf_directive_a="guessing no";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_printf_directive_a="guessing no";;
+           mingw* | windows*)    gl_cv_func_printf_directive_a="guessing no";;
                                  # If we don't know, obey 
--enable-cross-guesses.
            *)                    
gl_cv_func_printf_directive_a="$gl_cross_guess_normal";;
          esac
@@ -736,7 +744,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_B]
                                # Guess no on Android.
            linux*-android*)    gl_cv_func_printf_directive_b="guessing no";;
                                # Guess no on native Windows.
-           mingw*)             gl_cv_func_printf_directive_b="guessing no";;
+           mingw* | windows*)  gl_cv_func_printf_directive_b="guessing no";;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_printf_directive_b="$gl_cross_guess_normal";;
          esac
@@ -791,7 +799,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_UPPERCASE_B]
                                # Guess no on Android.
            linux*-android*)    
gl_cv_func_printf_directive_uppercase_b="guessing no";;
                                # Guess no on native Windows.
-           mingw*)             
gl_cv_func_printf_directive_uppercase_b="guessing no";;
+           mingw* | windows*)  
gl_cv_func_printf_directive_uppercase_b="guessing no";;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_printf_directive_uppercase_b="$gl_cross_guess_normal";;
          esac
@@ -857,7 +865,9 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_F]
            linux*-android*)      gl_cv_func_printf_directive_f="guessing no";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-gnu*)        gl_cv_func_printf_directive_f="guessing no" ;;
+           windows*-msvc*)       gl_cv_func_printf_directive_f="guessing yes" 
;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -923,21 +933,21 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_N]
         [gl_cv_func_printf_directive_n=yes],
         [gl_cv_func_printf_directive_n=no],
         [case "$host_os" in
-                            # Guess no on glibc when _FORTIFY_SOURCE >= 2.
-           *-gnu* | gnu*)   AC_COMPILE_IFELSE(
-                              [AC_LANG_SOURCE(
-                                 [[#if _FORTIFY_SOURCE >= 2
-                                    error fail
-                                   #endif
-                                 ]])],
-                              [gl_cv_func_printf_directive_n="guessing yes"],
-                              [gl_cv_func_printf_directive_n="guessing no"])
-                            ;;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_directive_n="guessing no";;
-                            # Guess no on native Windows.
-           mingw*)          gl_cv_func_printf_directive_n="guessing no";;
-           *)               gl_cv_func_printf_directive_n="guessing yes";;
+                              # Guess no on glibc when _FORTIFY_SOURCE >= 2.
+           *-gnu* | gnu*)     AC_COMPILE_IFELSE(
+                                [AC_LANG_SOURCE(
+                                   [[#if _FORTIFY_SOURCE >= 2
+                                      error fail
+                                     #endif
+                                   ]])],
+                                [gl_cv_func_printf_directive_n="guessing yes"],
+                                [gl_cv_func_printf_directive_n="guessing no"])
+                              ;;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_printf_directive_n="guessing no";;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_printf_directive_n="guessing no";;
+           *)                 gl_cv_func_printf_directive_n="guessing yes";;
          esac
         ])
     ])
@@ -1007,18 +1017,18 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_LS]
         [
 changequote(,)dnl
          case "$host_os" in
-                            # Guess yes on OpenBSD >= 6.0.
-           openbsd[1-5].*)  gl_cv_func_printf_directive_ls="guessing no";;
-           openbsd*)        gl_cv_func_printf_directive_ls="guessing yes";;
-           irix*)           gl_cv_func_printf_directive_ls="guessing no";;
-           solaris*)        gl_cv_func_printf_directive_ls="guessing no";;
-           cygwin*)         gl_cv_func_printf_directive_ls="guessing no";;
-           beos* | haiku*)  gl_cv_func_printf_directive_ls="guessing no";;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_printf_directive_ls="guessing yes";;
-           *)               gl_cv_func_printf_directive_ls="guessing yes";;
+                              # Guess yes on OpenBSD >= 6.0.
+           openbsd[1-5].*)    gl_cv_func_printf_directive_ls="guessing no";;
+           openbsd*)          gl_cv_func_printf_directive_ls="guessing yes";;
+           irix*)             gl_cv_func_printf_directive_ls="guessing no";;
+           solaris*)          gl_cv_func_printf_directive_ls="guessing no";;
+           cygwin*)           gl_cv_func_printf_directive_ls="guessing no";;
+           beos* | haiku*)    gl_cv_func_printf_directive_ls="guessing no";;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_printf_directive_ls="guessing no";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_printf_directive_ls="guessing yes";;
+           *)                 gl_cv_func_printf_directive_ls="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -1102,13 +1112,17 @@ AC_DEFUN_ONCE([gl_PRINTF_POSITIONS]
 changequote(,)dnl
          case "$host_os" in
            netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | 
netbsdcoff[1-3]*)
-                            gl_cv_func_printf_positions="guessing no";;
-           beos*)           gl_cv_func_printf_positions="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_positions="guessing yes";;
-                            # Guess no on native Windows.
-           mingw* | pw*)    gl_cv_func_printf_positions="guessing no";;
-           *)               gl_cv_func_printf_positions="guessing yes";;
+             gl_cv_func_printf_positions="guessing no";;
+           beos*)
+             gl_cv_func_printf_positions="guessing no";;
+             # Guess yes on Android.
+           linux*-android*)
+             gl_cv_func_printf_positions="guessing yes";;
+             # Guess no on native Windows.
+           mingw* | windows* | pw*)
+             gl_cv_func_printf_positions="guessing no";;
+           *)
+             gl_cv_func_printf_positions="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -1143,13 +1157,13 @@ AC_DEFUN([gl_PRINTF_FLAG_GROUPING]
         [
 changequote(,)dnl
          case "$host_os" in
-           cygwin*)         gl_cv_func_printf_flag_grouping="guessing no";;
-           netbsd*)         gl_cv_func_printf_flag_grouping="guessing no";;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
-                            # Guess no on native Windows.
-           mingw* | pw*)    gl_cv_func_printf_flag_grouping="guessing no";;
-           *)               gl_cv_func_printf_flag_grouping="guessing yes";;
+           cygwin*)                 gl_cv_func_printf_flag_grouping="guessing 
no";;
+           netbsd*)                 gl_cv_func_printf_flag_grouping="guessing 
no";;
+                                    # Guess no on Android.
+           linux*-android*)         gl_cv_func_printf_flag_grouping="guessing 
no";;
+                                    # Guess no on native Windows.
+           mingw* | windows* | pw*) gl_cv_func_printf_flag_grouping="guessing 
no";;
+           *)                       gl_cv_func_printf_flag_grouping="guessing 
yes";;
          esac
 changequote([,])dnl
         ])
@@ -1186,16 +1200,16 @@ AC_DEFUN([gl_PRINTF_FLAG_LEFTADJUST]
         [
 changequote(,)dnl
          case "$host_os" in
-                            # Guess yes on HP-UX 11.
-           hpux11*)         gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess no on HP-UX 10 and older.
-           hpux*)           gl_cv_func_printf_flag_leftadjust="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess yes otherwise.
-           *)               gl_cv_func_printf_flag_leftadjust="guessing yes";;
+                              # Guess yes on HP-UX 11.
+           hpux11*)           gl_cv_func_printf_flag_leftadjust="guessing 
yes";;
+                              # Guess no on HP-UX 10 and older.
+           hpux*)             gl_cv_func_printf_flag_leftadjust="guessing no";;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_printf_flag_leftadjust="guessing 
yes";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_printf_flag_leftadjust="guessing 
yes";;
+                              # Guess yes otherwise.
+           *)                 gl_cv_func_printf_flag_leftadjust="guessing 
yes";;
          esac
 changequote([,])dnl
         ])
@@ -1242,7 +1256,7 @@ AC_DEFUN([gl_PRINTF_FLAG_ZERO]
                                # Guess no on Android.
            linux*-android*)    gl_cv_func_printf_flag_zero="guessing no";;
                                # Guess no on native Windows.
-           mingw*)             gl_cv_func_printf_flag_zero="guessing no";;
+           mingw* | windows*)  gl_cv_func_printf_flag_zero="guessing no";;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";;
          esac
@@ -1297,12 +1311,12 @@ AC_DEFUN([gl_PRINTF_PRECISION]
 changequote(,)dnl
          case "$host_os" in
            # Guess no only on Solaris, native Windows, and BeOS systems.
-           solaris*)        gl_cv_func_printf_precision="guessing no" ;;
-           mingw* | pw*)    gl_cv_func_printf_precision="guessing no" ;;
-           beos*)           gl_cv_func_printf_precision="guessing no" ;;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_precision="guessing yes" ;;
-           *)               gl_cv_func_printf_precision="guessing yes" ;;
+           solaris*)                gl_cv_func_printf_precision="guessing no" 
;;
+           mingw* | windows* | pw*) gl_cv_func_printf_precision="guessing no" 
;;
+           beos*)                   gl_cv_func_printf_precision="guessing no" 
;;
+                                    # Guess yes on Android.
+           linux*-android*)         gl_cv_func_printf_precision="guessing yes" 
;;
+           *)                       gl_cv_func_printf_precision="guessing yes" 
;;
          esac
 changequote([,])dnl
         ])
@@ -1518,7 +1532,7 @@ AC_DEFUN_ONCE([gl_SNPRINTF_TRUNCATION_C99]
                                  # Guess yes on Android.
            linux*-android*)      gl_cv_func_snprintf_truncation_c99="guessing 
yes";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_snprintf_truncation_c99="guessing 
no";;
+           mingw* | windows*)    gl_cv_func_snprintf_truncation_c99="guessing 
no";;
                                  # If we don't know, obey 
--enable-cross-guesses.
            *)                    
gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";;
          esac
@@ -1615,7 +1629,9 @@ AC_DEFUN_ONCE([gl_SNPRINTF_RETVAL_C99]
            linux*-android*)      gl_cv_func_snprintf_retval_c99="guessing 
yes";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-gnu*)        gl_cv_func_snprintf_retval_c99="guessing no" 
;;
+           windows*-msvc*)       gl_cv_func_snprintf_retval_c99="guessing yes" 
;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -1719,7 +1735,7 @@ AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N]
                                  # Guess no on Android.
            linux*-android*)      gl_cv_func_snprintf_directive_n="guessing 
no";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_snprintf_directive_n="guessing 
no";;
+           mingw* | windows*)    gl_cv_func_snprintf_directive_n="guessing 
no";;
                                  # If we don't know, obey 
--enable-cross-guesses.
            *)                    
gl_cv_func_snprintf_directive_n="$gl_cross_guess_normal";;
 changequote([,])dnl
@@ -1767,11 +1783,11 @@ AC_DEFUN([gl_SNPRINTF_SIZE1]
         [gl_cv_func_snprintf_size1=yes],
         [gl_cv_func_snprintf_size1=no],
         [case "$host_os" in
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_snprintf_size1="guessing yes" ;;
-           *)               gl_cv_func_snprintf_size1="guessing yes" ;;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_snprintf_size1="guessing yes" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_snprintf_size1="guessing yes" ;;
+           *)                 gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
         ])
     ])
@@ -1844,40 +1860,40 @@ AC_DEFUN([gl_VSNPRINTF_ZEROSIZE_C99]
         [
 changequote(,)dnl
          case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu* | gnu*)        gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on musl systems.
-           *-musl* | midipix*)   gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
-           freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-           midnightbsd*)         gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
-           darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on Cygwin.
-           cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on Solaris >= 2.6.
+                                    # Guess yes on glibc systems.
+           *-gnu* | gnu*)           
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on musl systems.
+           *-musl* | midipix*)      
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on FreeBSD >= 5.
+           freebsd[1-4].*)          
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           freebsd* | kfreebsd*)    
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+           midnightbsd*)            
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Mac OS X >= 10.3.
+           darwin[1-6].*)           
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           darwin*)                 
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Cygwin.
+           cygwin*)                 
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Solaris >= 2.6.
            solaris2.[0-5] | solaris2.[0-5].*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
-           solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
-           aix*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on IRIX >= 6.5.
-           irix6.5)              gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on NetBSD >= 3.
+                                    
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           solaris*)                
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on AIX >= 4.
+           aix[1-3]*)               
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           aix*)                    
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on IRIX >= 6.5.
+           irix6.5)                 
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on NetBSD >= 3.
            netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | 
netbsdcoff[1-2]*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
-           netbsd*)              gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on Android.
-           linux*-android*)      gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # Guess yes on native Windows.
-           mingw* | pw*)         gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
-                                 # If we don't know, obey 
--enable-cross-guesses.
-           *)                    
gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
+                                    
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           netbsd*)                 
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on BeOS.
+           beos*)                   
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Android.
+           linux*-android*)         
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on native Windows.
+           mingw* | windows* | pw*) 
gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # If we don't know, obey 
--enable-cross-guesses.
+           *)                       
gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
          esac
 changequote([,])dnl
         ])
@@ -1934,17 +1950,17 @@ AC_DEFUN([gl_SWPRINTF_WORKS]
         [gl_cv_func_swprintf_works=yes],
         [gl_cv_func_swprintf_works=no],
         [case "$host_os" in
-                               # Guess yes on glibc systems.
-           *-gnu* | gnu*)      gl_cv_func_swprintf_works="guessing yes";;
-                               # Guess no on musl systems.
-           *-musl* | midipix*) gl_cv_func_swprintf_works="guessing no";;
-                               # Guess no on FreeBSD, NetBSD, OpenBSD, macOS, 
AIX.
+                                    # Guess yes on glibc systems.
+           *-gnu* | gnu*)           gl_cv_func_swprintf_works="guessing yes";;
+                                    # Guess no on musl systems.
+           *-musl* | midipix*)      gl_cv_func_swprintf_works="guessing no";;
+                                    # Guess no on FreeBSD, NetBSD, OpenBSD, 
macOS, AIX.
            freebsd* | midnightbsd* | netbsd* | openbsd* | darwin* | aix*)
-                               gl_cv_func_swprintf_works="guessing no";;
-                               # Guess no on native Windows.
-           mingw* | pw*)       gl_cv_func_swprintf_works="guessing no";;
-                               # If we don't know, obey --enable-cross-guesses.
-           *)                  
gl_cv_func_swprintf_works="$gl_cross_guess_normal";;
+                                    gl_cv_func_swprintf_works="guessing no";;
+                                    # Guess no on native Windows.
+           mingw* | windows* | pw*) gl_cv_func_swprintf_works="guessing no";;
+                                    # If we don't know, obey 
--enable-cross-guesses.
+           *)                       
gl_cv_func_swprintf_works="$gl_cross_guess_normal";;
          esac
         ])
     ])
@@ -1983,7 +1999,7 @@ AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LA]
         [gl_cv_func_swprintf_directive_la=yes],
         [gl_cv_func_swprintf_directive_la=no],
         [case "$host_os" in
-                                 # Guess yes on glibc >= 2.17 systems.
+                               # Guess yes on glibc >= 2.17 systems.
            *-gnu* | gnu*)
              AC_EGREP_CPP([Unlucky], [
                #include <features.h>
@@ -1996,14 +2012,14 @@ AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LA]
                [gl_cv_func_swprintf_directive_la="guessing yes"],
                [gl_cv_func_swprintf_directive_la="guessing no"])
              ;;
-                                 # Guess yes on musl systems.
-           *-musl* | midipix*)   gl_cv_func_swprintf_directive_la="guessing 
yes";;
-                                 # Guess yes on Android.
-           linux*-android*)      gl_cv_func_swprintf_directive_la="guessing 
yes";;
-                                 # Guess no on native Windows.
-           mingw*)               gl_cv_func_swprintf_directive_la="guessing 
no";;
-                                 # If we don't know, obey 
--enable-cross-guesses.
-           *)                    
gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_swprintf_directive_la="guessing 
yes";;
+                               # Guess yes on Android.
+           linux*-android*)    gl_cv_func_swprintf_directive_la="guessing 
yes";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_swprintf_directive_la="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  
gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";;
          esac
         ])
     ])
@@ -2040,16 +2056,16 @@ AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LC]
         [gl_cv_func_swprintf_directive_lc=yes],
         [gl_cv_func_swprintf_directive_lc=no],
         [case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu* | gnu*)        gl_cv_func_swprintf_directive_lc="guessing 
yes";;
-                                 # Guess no on musl systems.
-           *-musl* | midipix*)   gl_cv_func_swprintf_directive_lc="guessing 
no";;
-                                 # Guess no on Android.
-           linux*-android*)      gl_cv_func_swprintf_directive_lc="guessing 
no";;
-                                 # Guess yes on native Windows.
-           mingw*)               gl_cv_func_swprintf_directive_lc="guessing 
yes";;
-                                 # If we don't know, obey 
--enable-cross-guesses.
-           *)                    
gl_cv_func_swprintf_directive_lc="$gl_cross_guess_normal";;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_swprintf_directive_lc="guessing 
yes";;
+                               # Guess no on musl systems.
+           *-musl* | midipix*) gl_cv_func_swprintf_directive_lc="guessing no";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_swprintf_directive_lc="guessing no";;
+                               # Guess yes on native Windows.
+           mingw* | windows*)  gl_cv_func_swprintf_directive_lc="guessing 
yes";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  
gl_cv_func_swprintf_directive_lc="$gl_cross_guess_normal";;
          esac
         ])
     ])
diff --git a/m4/pthread-cond.m4 b/m4/pthread-cond.m4
index 4eddeb7914..3328c5167d 100644
--- a/m4/pthread-cond.m4
+++ b/m4/pthread-cond.m4
@@ -1,4 +1,4 @@
-# pthread-cond.m4 serial 2
+# pthread-cond.m4 serial 3
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_COND]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-mutex.m4 b/m4/pthread-mutex.m4
index 197c62ec6d..5932b8b38b 100644
--- a/m4/pthread-mutex.m4
+++ b/m4/pthread-mutex.m4
@@ -1,4 +1,4 @@
-# pthread-mutex.m4 serial 3
+# pthread-mutex.m4 serial 4
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_MUTEX]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-once.m4 b/m4/pthread-once.m4
index deac4609fc..a39785ce74 100644
--- a/m4/pthread-once.m4
+++ b/m4/pthread-once.m4
@@ -1,4 +1,4 @@
-# pthread-once.m4 serial 1
+# pthread-once.m4 serial 2
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_ONCE]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-rwlock.m4 b/m4/pthread-rwlock.m4
index ac559e9cce..681655a523 100644
--- a/m4/pthread-rwlock.m4
+++ b/m4/pthread-rwlock.m4
@@ -1,4 +1,4 @@
-# pthread-rwlock.m4 serial 2
+# pthread-rwlock.m4 serial 3
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_RWLOCK]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-spin.m4 b/m4/pthread-spin.m4
index d64bb682fb..3e8971fcc8 100644
--- a/m4/pthread-spin.m4
+++ b/m4/pthread-spin.m4
@@ -1,4 +1,4 @@
-# pthread-spin.m4 serial 2
+# pthread-spin.m4 serial 3
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_SPIN]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-thread.m4 b/m4/pthread-thread.m4
index aafd979385..9c099dafe3 100644
--- a/m4/pthread-thread.m4
+++ b/m4/pthread-thread.m4
@@ -1,4 +1,4 @@
-# pthread-thread.m4 serial 2
+# pthread-thread.m4 serial 3
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_THREAD]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread-tss.m4 b/m4/pthread-tss.m4
index b1db2a6247..c9af7c4202 100644
--- a/m4/pthread-tss.m4
+++ b/m4/pthread-tss.m4
@@ -1,4 +1,4 @@
-# pthread-tss.m4 serial 1
+# pthread-tss.m4 serial 2
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_PTHREAD_TSS]
   AC_REQUIRE([gl_PTHREAD_H])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4
index 0d536fc97a..8f78bd2737 100644
--- a/m4/pthread_h.m4
+++ b/m4/pthread_h.m4
@@ -1,4 +1,4 @@
-# pthread_h.m4 serial 8
+# pthread_h.m4 serial 9
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ AC_DEFUN_ONCE([gl_PTHREAD_H]
     dnl ignore the <pthread.h> from the mingw-w64 winpthreads library.
     m4_ifdef([gl_][THREADLIB], [
       AC_REQUIRE([gl_][THREADLIB])
-      if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+      if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
          && test $gl_threads_api = windows; then
         HAVE_PTHREAD_H=0
       fi
diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4
index 66b29f8963..7cc650c49d 100644
--- a/m4/pthread_rwlock_rdlock.m4
+++ b/m4/pthread_rwlock_rdlock.m4
@@ -1,4 +1,4 @@
-# pthread_rwlock_rdlock.m4 serial 5
+# pthread_rwlock_rdlock.m4 serial 6
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -164,7 +164,7 @@ AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER]
           *-android*)         
gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
                               # Guess yes on native Windows with the mingw-w64 
winpthreads library.
                               # Guess no on native Windows with the gnulib 
windows-rwlock module.
-          mingw*)             if test "$gl_use_threads" = yes || test 
"$gl_use_threads" = posix; then
+          mingw* | windows*)  if test "$gl_use_threads" = yes || test 
"$gl_use_threads" = posix; then
                                 
gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"
                               else
                                 
gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no"
diff --git a/m4/ptsname_r.m4 b/m4/ptsname_r.m4
index a62bb01960..27ea4fdca6 100644
--- a/m4/ptsname_r.m4
+++ b/m4/ptsname_r.m4
@@ -1,4 +1,4 @@
-# ptsname_r.m4 serial 8
+# ptsname_r.m4 serial 9
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -103,7 +103,8 @@ AC_DEFUN([gl_PREREQ_PTSNAME_R]
        [case "$host_os" in
           irix* | solaris*)
             gl_cv_func_isatty_sets_errno="guessing no" ;;
-          mingw*) # Guess yes on mingw, no on MSVC.
+            # Guess yes on mingw, no on MSVC.
+          mingw* | windows*)
             AC_EGREP_CPP([Known], [
 #ifdef __MINGW32__
  Known
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index d37a60213f..97a57d845f 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,4 +1,4 @@
-# putenv.m4 serial 26
+# putenv.m4 serial 27
 dnl Copyright (C) 2002-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -43,7 +43,7 @@ AC_DEFUN([gl_FUNC_PUTENV]
                               # Guess yes on musl systems.
           *-musl* | midipix*) gl_cv_func_svid_putenv="guessing yes" ;;
                               # Guess no on native Windows.
-          mingw*)             gl_cv_func_svid_putenv="guessing no" ;;
+          mingw* | windows*)  gl_cv_func_svid_putenv="guessing no" ;;
                               # If we don't know, obey --enable-cross-guesses.
           *)                  gl_cv_func_svid_putenv="$gl_cross_guess_normal" 
;;
         esac
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 26053914cb..fcd6253557 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,4 +1,4 @@
-# realloc.m4 serial 27
+# realloc.m4 serial 28
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,7 +26,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF]
           # Guess yes on platforms where we know the result.
           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
           | gnu* | *-musl* | midipix* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
+          | hpux* | solaris* | cygwin* | mingw* | windows* | msys* )
             ac_cv_func_realloc_0_nonnull="guessing yes" ;;
           # If we don't know, obey --enable-cross-guesses.
           *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;;
diff --git a/m4/regex.m4 b/m4/regex.m4
index 7acadc4834..20082b89a8 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-# serial 74
+# serial 75
 
 # Copyright (C) 1996-2001, 2003-2023 Free Software Foundation, Inc.
 #
@@ -327,10 +327,10 @@ AC_DEFUN([gl_REGEX]
         [gl_cv_func_re_compile_pattern_working=yes],
         [gl_cv_func_re_compile_pattern_working=no],
         [case "$host_os" in
-                   # Guess no on native Windows.
-           mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;;
-                   # Otherwise obey --enable-cross-guesses.
-           *)      
gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_re_compile_pattern_working="guessing 
no" ;;
+                              # Otherwise obey --enable-cross-guesses.
+           *)                 
gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;;
          esac
         ])
       ])
diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index db3801a82c..ba0ae821ea 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 24
+# relocatable.m4 serial 25
 dnl Copyright (C) 2003, 2005-2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY]
     AC_CHECK_HEADERS([mach-o/dyld.h])
     AC_CHECK_FUNCS([_NSGetExecutablePath])
     case "$host_os" in
-      mingw*) is_noop=yes ;;
+      mingw* | windows*) is_noop=yes ;;
       # For the platforms that support $ORIGIN, see
       # <https://lekensteyn.nl/rpath.html>.
       # glibc systems, Linux with musl libc: yes. Android: no.
diff --git a/m4/remainder.m4 b/m4/remainder.m4
index 0e79bd7d03..62c7556ae7 100644
--- a/m4/remainder.m4
+++ b/m4/remainder.m4
@@ -1,4 +1,4 @@
-# remainder.m4 serial 10
+# remainder.m4 serial 11
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -97,7 +97,7 @@ AC_DEFUN([gl_FUNC_REMAINDER]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_remainder_ieee="guessing yes" 
;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_remainder_ieee="guessing yes" 
;;
+                 mingw* | windows*)  gl_cv_func_remainder_ieee="guessing yes" 
;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_remainder_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/remainderf.m4 b/m4/remainderf.m4
index 10ed65a405..bae3d352cd 100644
--- a/m4/remainderf.m4
+++ b/m4/remainderf.m4
@@ -1,4 +1,4 @@
-# remainderf.m4 serial 14
+# remainderf.m4 serial 15
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -100,7 +100,7 @@ AC_DEFUN([gl_FUNC_REMAINDERF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_remainderf_ieee="guessing yes" 
;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_remainderf_ieee="guessing yes" 
;;
+                 mingw* | windows*)  gl_cv_func_remainderf_ieee="guessing yes" 
;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_remainderf_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -188,10 +188,10 @@ AC_DEFUN([gl_FUNC_REMAINDERF_WORKS]
         [gl_cv_func_remainderf_works=yes],
         [gl_cv_func_remainderf_works=no],
         [case "$host_os" in
-           irix*)  gl_cv_func_remainderf_works="guessing no" ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_remainderf_works="guessing yes" ;;
-           *)      gl_cv_func_remainderf_works="guessing yes" ;;
+           irix*)             gl_cv_func_remainderf_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_remainderf_works="guessing yes" ;;
+           *)                 gl_cv_func_remainderf_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/remainderl.m4 b/m4/remainderl.m4
index 3282cc86ce..fcb4c91cf4 100644
--- a/m4/remainderl.m4
+++ b/m4/remainderl.m4
@@ -1,4 +1,4 @@
-# remainderl.m4 serial 14
+# remainderl.m4 serial 15
 dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -105,7 +105,7 @@ AC_DEFUN([gl_FUNC_REMAINDERL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_remainderl_ieee="guessing yes" 
;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_remainderl_ieee="guessing yes" 
;;
+                 mingw* | windows*)  gl_cv_func_remainderl_ieee="guessing yes" 
;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_remainderl_ieee="$gl_cross_guess_normal" ;;
                esac
@@ -246,7 +246,7 @@ AC_DEFUN([gl_FUNC_REMAINDERL_WORKS]
                                # Guess no on OpenBSD.
            openbsd*)           gl_cv_func_remainderl_works="guessing no" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_remainderl_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_remainderl_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_remainderl_works="$gl_cross_guess_normal" ;;
          esac
diff --git a/m4/remove.m4 b/m4/remove.m4
index c76e097b43..9d80d53896 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,4 +1,4 @@
-# remove.m4 serial 5
+# remove.m4 serial 6
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,8 +30,8 @@ AC_DEFUN([gl_FUNC_REMOVE]
 ]], [[return remove ("conftest.dir");]])],
          [gl_cv_func_remove_dir_works=yes], [gl_cv_func_remove_dir_works=no],
          [case $host_os in
-            mingw*) gl_cv_func_remove_dir_works="guessing no";;
-            *) gl_cv_func_remove_dir_works="guessing yes";;
+            mingw* | windows*) gl_cv_func_remove_dir_works="guessing no" ;;
+            *)                 gl_cv_func_remove_dir_works="guessing yes" ;;
           esac])
        rm -rf conftest.dir])
     case $gl_cv_func_remove_dir_works in
diff --git a/m4/rename.m4 b/m4/rename.m4
index efabf1a24b..b41c3f3ac6 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-# serial 34
+# serial 35
 
 # Copyright (C) 2001, 2003, 2005-2006, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -55,16 +55,16 @@ AC_DEFUN([gl_FUNC_RENAME]
       [gl_cv_func_rename_slash_dst_works=no],
       dnl When crosscompiling, assume rename is broken.
       [case "$host_os" in
-                          # Guess yes on Linux systems.
-         linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
-                          # Guess yes on systems that emulate the Linux system 
calls.
-         midipix*)        gl_cv_func_rename_slash_dst_works="guessing yes" ;;
-                          # Guess yes on glibc systems.
-         *-gnu*)          gl_cv_func_rename_slash_dst_works="guessing yes" ;;
-                          # Guess no on native Windows.
-         mingw*)          gl_cv_func_rename_slash_dst_works="guessing no" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-         *)               
gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;;
+                            # Guess yes on Linux systems.
+         linux-* | linux)   gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+                            # Guess yes on systems that emulate the Linux 
system calls.
+         midipix*)          gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+                            # Guess yes on glibc systems.
+         *-gnu*)            gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_rename_slash_dst_works="guessing no" ;;
+                            # If we don't know, obey --enable-cross-guesses.
+         *)                 
gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;;
        esac
       ])
     rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 
conftest.lnk
@@ -113,16 +113,16 @@ AC_DEFUN([gl_FUNC_RENAME]
       [gl_cv_func_rename_slash_src_works=no],
       dnl When crosscompiling, assume rename is broken.
       [case "$host_os" in
-                          # Guess yes on Linux systems.
-         linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;;
-                          # Guess yes on systems that emulate the Linux system 
calls.
-         midipix*)        gl_cv_func_rename_slash_src_works="guessing yes" ;;
-                          # Guess yes on glibc systems.
-         *-gnu*)          gl_cv_func_rename_slash_src_works="guessing yes" ;;
-                          # Guess yes on native Windows.
-         mingw*)          gl_cv_func_rename_slash_src_works="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-         *)               
gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;;
+                            # Guess yes on Linux systems.
+         linux-* | linux)   gl_cv_func_rename_slash_src_works="guessing yes" ;;
+                            # Guess yes on systems that emulate the Linux 
system calls.
+         midipix*)          gl_cv_func_rename_slash_src_works="guessing yes" ;;
+                            # Guess yes on glibc systems.
+         *-gnu*)            gl_cv_func_rename_slash_src_works="guessing yes" ;;
+                            # Guess yes on native Windows.
+         mingw* | windows*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+                            # If we don't know, obey --enable-cross-guesses.
+         *)                 
gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;;
        esac
       ])
     rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 
conftest.lnk
@@ -186,16 +186,16 @@ AC_DEFUN([gl_FUNC_RENAME]
        else
          dnl When crosscompiling, assume rename is broken.
          case "$host_os" in
-                            # Guess yes on Linux systems.
-           linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;;
-                            # Guess yes on systems that emulate the Linux 
system calls.
-           midipix*)        gl_cv_func_rename_link_works="guessing yes" ;;
-                            # Guess yes on glibc systems.
-           *-gnu*)          gl_cv_func_rename_link_works="guessing yes" ;;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_rename_link_works="guessing yes" ;;
-                            # If we don't know, obey --enable-cross-guesses.
-           *)               
gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;;
+                              # Guess yes on Linux systems.
+           linux-* | linux)   gl_cv_func_rename_link_works="guessing yes" ;;
+                              # Guess yes on systems that emulate the Linux 
system calls.
+           midipix*)          gl_cv_func_rename_link_works="guessing yes" ;;
+                              # Guess yes on glibc systems.
+           *-gnu*)            gl_cv_func_rename_link_works="guessing yes" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_rename_link_works="guessing yes" ;;
+                              # If we don't know, obey --enable-cross-guesses.
+           *)                 
gl_cv_func_rename_link_works="$gl_cross_guess_normal" ;;
          esac
        fi
      else
@@ -237,14 +237,14 @@ AC_DEFUN([gl_FUNC_RENAME]
       [gl_cv_func_rename_dest_works=no],
       dnl When crosscompiling, assume rename is broken.
       [case "$host_os" in
-                          # Guess yes on Linux systems.
-         linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;;
-                          # Guess yes on glibc systems.
-         *-gnu*)          gl_cv_func_rename_dest_works="guessing yes" ;;
-                          # Guess no on native Windows.
-         mingw*)          gl_cv_func_rename_dest_works="guessing no" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-         *)               
gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;;
+                            # Guess yes on Linux systems.
+         linux-* | linux)   gl_cv_func_rename_dest_works="guessing yes" ;;
+                            # Guess yes on glibc systems.
+         *-gnu*)            gl_cv_func_rename_dest_works="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_rename_dest_works="guessing no" ;;
+                            # If we don't know, obey --enable-cross-guesses.
+         *)                 
gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;;
        esac
       ])
     rm -rf conftest.f conftest.d1 conftest.d2
diff --git a/m4/rintl.m4 b/m4/rintl.m4
index cb9bff55c2..c641569350 100644
--- a/m4/rintl.m4
+++ b/m4/rintl.m4
@@ -1,4 +1,4 @@
-# rintl.m4 serial 9
+# rintl.m4 serial 10
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -55,7 +55,7 @@ AC_DEFUN([gl_FUNC_RINTL]
                                    # Guess yes on musl systems.
                *-musl* | midipix*) gl_cv_func_rintl_works="guessing yes" ;;
                                    # Guess yes on native Windows.
-               mingw*)             gl_cv_func_rintl_works="guessing yes" ;;
+               mingw* | windows*)  gl_cv_func_rintl_works="guessing yes" ;;
                                    # If we don't know, obey 
--enable-cross-guesses.
                *)                  
gl_cv_func_rintl_works="$gl_cross_guess_normal" ;;
              esac
diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index b1c38f10db..002d030784 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,4 +1,4 @@
-# serial 15
+# serial 16
 
 # Copyright (C) 2000-2001, 2005-2006, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -42,9 +42,9 @@ AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY]
         [gl_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`],
         [gl_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4'],
         [case "$host_os" in
-                   # Guess ENOTEMPTY = 41 on native Windows.
-           mingw*) gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY ;;
-           *)      gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY ;;
+                              # Guess ENOTEMPTY = 41 on native Windows.
+           mingw* | windows*) gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY ;;
+           *)                 gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY ;;
          esac
         ])
     ]
diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index b19c890187..c5552d598c 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,4 +1,4 @@
-# rmdir.m4 serial 18
+# rmdir.m4 serial 19
 dnl Copyright (C) 2002, 2005, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -34,16 +34,16 @@ AC_DEFUN([gl_FUNC_RMDIR]
          ]])],
        [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
        [case "$host_os" in
-                           # Guess yes on Linux systems.
-          linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;;
-                           # Guess yes on systems that emulate the Linux 
system calls.
-          midipix*)        gl_cv_func_rmdir_works="guessing yes" ;;
-                           # Guess yes on glibc systems.
-          *-gnu* | gnu*)   gl_cv_func_rmdir_works="guessing yes" ;;
-                           # Guess no on native Windows.
-          mingw*)          gl_cv_func_rmdir_works="guessing no" ;;
-                           # If we don't know, obey --enable-cross-guesses.
-          *)               gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on Linux systems.
+          linux-* | linux)   gl_cv_func_rmdir_works="guessing yes" ;;
+                             # Guess yes on systems that emulate the Linux 
system calls.
+          midipix*)          gl_cv_func_rmdir_works="guessing yes" ;;
+                             # Guess yes on glibc systems.
+          *-gnu* | gnu*)     gl_cv_func_rmdir_works="guessing yes" ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) gl_cv_func_rmdir_works="guessing no" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;;
         esac
        ])
      rm -rf conftest.dir conftest.file])
diff --git a/m4/round.m4 b/m4/round.m4
index febc098ef9..4d6290fdb7 100644
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -1,4 +1,4 @@
-# round.m4 serial 24
+# round.m4 serial 25
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -60,17 +60,19 @@ AC_DEFUN([gl_FUNC_ROUND]
   return (x < 0.5 && round (x) != 0.0);
 }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
         [case "$host_os" in
-           netbsd* | aix*) gl_cv_func_round_works="guessing no" ;;
-                           # Guess yes on MSVC, no on mingw.
-           mingw*)         AC_EGREP_CPP([Known], [
+           netbsd* | aix*)    gl_cv_func_round_works="guessing no" ;;
+                              # Guess yes on MSVC, no on mingw.
+           windows*-gnu*)     gl_cv_func_round_works="guessing no" ;;
+           windows*-msvc*)    gl_cv_func_round_works="guessing yes" ;;
+           mingw* | windows*) AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
-                             ],
-                             [gl_cv_func_round_works="guessing yes"],
-                             [gl_cv_func_round_works="guessing no"])
-                           ;;
-           *)              gl_cv_func_round_works="guessing yes" ;;
+                                ],
+                                [gl_cv_func_round_works="guessing yes"],
+                                [gl_cv_func_round_works="guessing no"])
+                              ;;
+           *)                 gl_cv_func_round_works="guessing yes" ;;
          esac
         ])
         LIBS="$save_LIBS"
@@ -118,7 +120,9 @@ AC_DEFUN([gl_FUNC_ROUND]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_round_ieee="guessing yes" ;;
                                      # Guess yes on MSVC, no on mingw.
-                 mingw*)             AC_EGREP_CPP([Known], [
+                 windows*-gnu*)      gl_cv_func_round_ieee="guessing no" ;;
+                 windows*-msvc*)     gl_cv_func_round_ieee="guessing yes" ;;
+                 mingw* | windows*)  AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
diff --git a/m4/roundf.m4 b/m4/roundf.m4
index ca8f6398b4..b8959163ce 100644
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -1,4 +1,4 @@
-# roundf.m4 serial 25
+# roundf.m4 serial 26
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -57,16 +57,25 @@ AC_DEFUN([gl_FUNC_ROUNDF]
   return (x < 0.5f && roundf (x) != 0.0f);
 }]])], [gl_cv_func_roundf_works=yes], [gl_cv_func_roundf_works=no],
         [case "$host_os" in
-                   # Guess yes on MSVC, no on mingw.
-           mingw*) AC_EGREP_CPP([Known], [
+             # Guess yes on MSVC, no on mingw.
+           windows*-gnu*)
+             gl_cv_func_roundf_works="guessing no"
+             ;;
+           windows*-msvc*)
+             gl_cv_func_roundf_works="guessing yes"
+             ;;
+           mingw* | windows*)
+             AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
-                     ],
-                     [gl_cv_func_roundf_works="guessing yes"],
-                     [gl_cv_func_roundf_works="guessing no"])
-                   ;;
-           *)      gl_cv_func_roundf_works="guessing yes" ;;
+               ],
+               [gl_cv_func_roundf_works="guessing yes"],
+               [gl_cv_func_roundf_works="guessing no"])
+             ;;
+           *)
+             gl_cv_func_roundf_works="guessing yes"
+             ;;
          esac
         ])
         LIBS="$save_LIBS"
@@ -118,7 +127,9 @@ AC_DEFUN([gl_FUNC_ROUNDF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_roundf_ieee="guessing yes" ;;
                                      # Guess yes on MSVC, no on mingw.
-                 mingw*)             AC_EGREP_CPP([Known], [
+                 windows*-gnu*)      gl_cv_func_roundf_ieee="guessing no" ;;
+                 windows*-msvc*)     gl_cv_func_roundf_ieee="guessing yes" ;;
+                 mingw* | windows*)  AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
diff --git a/m4/roundl.m4 b/m4/roundl.m4
index f23378cfb5..ce3d359089 100644
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -1,4 +1,4 @@
-# roundl.m4 serial 21
+# roundl.m4 serial 22
 dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_ROUNDL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_roundl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_roundl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_roundl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_roundl_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/sched_yield.m4 b/m4/sched_yield.m4
index a1cb91e713..39d2bc1570 100644
--- a/m4/sched_yield.m4
+++ b/m4/sched_yield.m4
@@ -1,4 +1,4 @@
-# sched_yield.m4 serial 2
+# sched_yield.m4 serial 3
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_SCHED_YIELD]
   AC_REQUIRE([gl_PTHREADLIB])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
-  if { case "$host_os" in mingw*) true;; *) false;; esac; } \
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
      && test $gl_threads_api = windows; then
     dnl Choose function names that don't conflict with the mingw-w64 
winpthreads
     dnl library.
diff --git a/m4/select.m4 b/m4/select.m4
index 88861af486..68510473c5 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,4 +1,4 @@
-# select.m4 serial 15
+# select.m4 serial 16
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -96,7 +96,7 @@ AC_DEFUN([gl_FUNC_SELECT]
   SELECT_LIB="$LIBSOCKET"
   if test $REPLACE_SELECT = 1; then
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         dnl On the MSVC platform, the function MsgWaitForMultipleObjects
         dnl (used in lib/select.c) requires linking with -luser32. On mingw,
         dnl it is implicit.
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 2e8094dc9a..463dd9b334 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 9
+# setlocale.m4 serial 10
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE]
   case "$host_os" in
     dnl On native Windows systems, setlocale(category,NULL) does not look at
     dnl the environment variables LC_ALL, category, and LANG.
-    mingw*) NEED_SETLOCALE_IMPROVED=1 ;;
+    mingw* | windows*) NEED_SETLOCALE_IMPROVED=1 ;;
     dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
     dnl is then still "C".
     cygwin*)
diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4
index 1105d693fe..bafc5be8ec 100644
--- a/m4/setlocale_null.m4
+++ b/m4/setlocale_null.m4
@@ -1,4 +1,4 @@
-# setlocale_null.m4 serial 8
+# setlocale_null.m4 serial 9
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL]
           [gl_cv_func_setlocale_null_all_mtsafe=no])
         ;;
        # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows.
-       *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*)
+       *-gnu* | gnu* | hpux* | irix* | solaris* | mingw* | windows*)
          gl_cv_func_setlocale_null_all_mtsafe=yes ;;
        # If we don't know, obey --enable-cross-guesses.
        *)
@@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL]
     ])
   dnl On platforms without multithreading, there is no issue.
   case "$host_os" in
-    mingw*) ;;
+    mingw* | windows*) ;;
     *)
       if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then
         gl_cv_func_setlocale_null_all_mtsafe="trivially yes"
@@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL]
        openbsd* | aix*)
          gl_cv_func_setlocale_null_one_mtsafe=no ;;
        # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, 
Solaris, Haiku, Cygwin, native Windows.
-       *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* 
| netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*)
+       *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* 
| netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw* | windows*)
          gl_cv_func_setlocale_null_one_mtsafe=yes ;;
        # If we don't know, obey --enable-cross-guesses.
        *)
@@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL]
     ])
   dnl On platforms without multithreading, there is no issue.
   case "$host_os" in
-    mingw*) ;;
+    mingw* | windows*) ;;
     *)
       if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then
         gl_cv_func_setlocale_null_one_mtsafe="trivially yes"
@@ -88,7 +88,9 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL]
   dnl Determine link dependencies of lib/setlocale_null.c and 
lib/setlocale-lock.c.
   if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 
0; then
     case "$host_os" in
-      mingw*) SETLOCALE_NULL_LIB= ;;
+      mingw* | windows*)
+        SETLOCALE_NULL_LIB=
+        ;;
       *)
         gl_WEAK_SYMBOLS
         case "$gl_cv_have_weak" in
diff --git a/m4/signbit.m4 b/m4/signbit.m4
index 2fea73f854..a3be0d79d8 100644
--- a/m4/signbit.m4
+++ b/m4/signbit.m4
@@ -1,4 +1,4 @@
-# signbit.m4 serial 21
+# signbit.m4 serial 22
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@ AC_DEFUN([gl_SIGNBIT]
                                # Guess yes on musl systems.
            *-musl* | midipix*) gl_cv_func_signbit="guessing yes" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_signbit="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_signbit="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  gl_cv_func_signbit="$gl_cross_guess_normal" ;;
          esac
@@ -68,7 +68,7 @@ AC_DEFUN([gl_SIGNBIT]
                                # Guess yes on musl systems.
            *-musl* | midipix*) gl_cv_func_signbit_builtins="guessing yes" ;;
                                # Guess yes on mingw, no on MSVC.
-           mingw*)             if test -n "$GCC"; then
+           mingw* | windows*)  if test -n "$GCC"; then
                                  gl_cv_func_signbit_builtins="guessing yes"
                                else
                                  gl_cv_func_signbit_builtins="guessing no"
diff --git a/m4/sleep.m4 b/m4/sleep.m4
index 269b73b9a1..7b16aa970b 100644
--- a/m4/sleep.m4
+++ b/m4/sleep.m4
@@ -1,4 +1,4 @@
-# sleep.m4 serial 12
+# sleep.m4 serial 13
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -46,16 +46,16 @@ AC_DEFUN([gl_FUNC_SLEEP]
     ]])],
       [gl_cv_func_sleep_works=yes], [gl_cv_func_sleep_works=no],
       [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_sleep_works="guessing yes" ;;
-                        # Guess yes on systems that emulate the Linux system 
calls.
-         midipix*)      gl_cv_func_sleep_works="guessing yes" ;;
-                        # Guess no on native Windows.
-         mingw*)        gl_cv_func_sleep_works="guessing no" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_sleep_works="$gl_cross_guess_normal" ;;
+                            # Guess yes on glibc systems.
+         *-gnu* | gnu*)     gl_cv_func_sleep_works="guessing yes" ;;
+                            # Guess yes on musl systems.
+         *-musl*)           gl_cv_func_sleep_works="guessing yes" ;;
+                            # Guess yes on systems that emulate the Linux 
system calls.
+         midipix*)          gl_cv_func_sleep_works="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_sleep_works="guessing no" ;;
+                            # If we don't know, obey --enable-cross-guesses.
+         *)                 gl_cv_func_sleep_works="$gl_cross_guess_normal" ;;
        esac
       ])])
     case "$gl_cv_func_sleep_works" in
diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4
index d1a59564c5..eb1701f800 100644
--- a/m4/sqrtl.m4
+++ b/m4/sqrtl.m4
@@ -1,4 +1,4 @@
-# sqrtl.m4 serial 11
+# sqrtl.m4 serial 12
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -154,10 +154,10 @@ AC_DEFUN([gl_FUNC_SQRTL_WORKS]
         [gl_cv_func_sqrtl_works=yes],
         [gl_cv_func_sqrtl_works=no],
         [case "$host_os" in
-           openbsd*) gl_cv_func_sqrtl_works="guessing no" ;;
-                     # Guess yes on native Windows.
-           mingw*)   gl_cv_func_sqrtl_works="guessing yes" ;;
-           *)        gl_cv_func_sqrtl_works="guessing yes" ;;
+           openbsd*)          gl_cv_func_sqrtl_works="guessing no" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_sqrtl_works="guessing yes" ;;
+           *)                 gl_cv_func_sqrtl_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/m4/stat.m4 b/m4/stat.m4
index 6d1628c217..81bd16a8f4 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,4 +1,4 @@
-# serial 19
+# serial 20
 
 # Copyright (C) 2009-2023 Free Software Foundation, Inc.
 #
@@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_STAT]
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([lstat])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl On this platform, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
       REPLACE_STAT=1
@@ -80,7 +80,7 @@ AC_DEFUN([gl_PREREQ_STAT]
 AC_DEFUN([gl_PREREQ_STAT_W32], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_CHECK_HEADERS([sdkddkver.h])
       ;;
   esac
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index b9f764d4c1..d5ff08b1b8 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 62
+# stdint.m4 serial 63
 dnl Copyright (C) 2001-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -286,10 +286,10 @@ AC_DEFUN_ONCE([gl_STDINT_H]
               [gl_cv_header_working_stdint_h=yes],
               [],
               [case "$host_os" in
-                         # Guess yes on native Windows.
-                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
-                         # In general, assume it works.
-                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # Guess yes on native Windows.
+                 mingw* | windows*) gl_cv_header_working_stdint_h="guessing 
yes" ;;
+                                    # In general, assume it works.
+                 *)                 gl_cv_header_working_stdint_h="guessing 
yes" ;;
                esac
               ])
          ])
diff --git a/m4/strerror.m4 b/m4/strerror.m4
index 9f1dddd599..0e1f7d73aa 100644
--- a/m4/strerror.m4
+++ b/m4/strerror.m4
@@ -1,4 +1,4 @@
-# strerror.m4 serial 24
+# strerror.m4 serial 25
 dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -85,7 +85,7 @@ AC_DEFUN([gl_FUNC_STRERROR_0]
                              # Guess yes on musl systems.
          *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;;
                              # Guess yes on native Windows.
-         mingw*)             gl_cv_func_strerror_0_works="guessing yes" ;;
+         mingw* | windows*)  gl_cv_func_strerror_0_works="guessing yes" ;;
                              # If we don't know, obey --enable-cross-guesses.
          *)                  
gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
        esac
diff --git a/m4/strftime-fixes.m4 b/m4/strftime-fixes.m4
index 19136d03b9..5da9e6e6af 100644
--- a/m4/strftime-fixes.m4
+++ b/m4/strftime-fixes.m4
@@ -1,4 +1,4 @@
-# strftime-fixes.m4 serial 3
+# strftime-fixes.m4 serial 4
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,6 @@ AC_DEFUN([gl_FUNC_STRFTIME]
   AC_REQUIRE([gl_TIME_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) REPLACE_STRFTIME=1 ;;
+    mingw* | windows*) REPLACE_STRFTIME=1 ;;
   esac
 ])
diff --git a/m4/strncat.m4 b/m4/strncat.m4
index 1cef7aade0..c6b4ccb880 100644
--- a/m4/strncat.m4
+++ b/m4/strncat.m4
@@ -1,4 +1,4 @@
-# strncat.m4 serial 7
+# strncat.m4 serial 8
 dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -84,12 +84,12 @@ AC_DEFUN_ONCE([gl_FUNC_STRNCAT]
 ]])], [gl_cv_func_strncat_works=yes], [gl_cv_func_strncat_works=no],
        [
         case "$host_os" in
-                    # Guess no on Solaris.
-          solaris*) gl_cv_func_strncat_works="guessing no" ;;
-                    # Guess yes on native Windows.
-          mingw*)   gl_cv_func_strncat_works="guessing yes" ;;
-                    # Guess yes otherwise.
-          *)        gl_cv_func_strncat_works="guessing yes" ;;
+                             # Guess no on Solaris.
+          solaris*)          gl_cv_func_strncat_works="guessing no" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_strncat_works="guessing yes" ;;
+                             # Guess yes otherwise.
+          *)                 gl_cv_func_strncat_works="guessing yes" ;;
         esac
        ])
     ])
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index ae7446c2fa..771269def3 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -1,4 +1,4 @@
-# strtod.m4 serial 28
+# strtod.m4 serial 29
 dnl Copyright (C) 2002-2003, 2006-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -118,7 +118,7 @@ AC_DEFUN([gl_FUNC_STRTOD]
                                   # Guess yes on musl systems.
               *-musl* | midipix*) gl_cv_func_strtod_works="guessing yes" ;;
                                   # Guess yes on native Windows.
-              mingw*)             gl_cv_func_strtod_works="guessing yes" ;;
+              mingw* | windows*)  gl_cv_func_strtod_works="guessing yes" ;;
               *)                  
gl_cv_func_strtod_works="$gl_cross_guess_normal" ;;
             esac
            ])
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index db5cfb7aa9..0787d0e26b 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 16
+# strtoimax.m4 serial 17
 dnl Copyright (C) 2002-2004, 2006, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,12 +61,12 @@ AC_DEFUN([gl_FUNC_STRTOIMAX]
          [gl_cv_func_strtoimax=yes],
          [gl_cv_func_strtoimax=no],
          [case "$host_os" in
-                    # Guess no on AIX 5.
-            aix5*)  gl_cv_func_strtoimax="guessing no" ;;
-                    # Guess yes on native Windows.
-            mingw*) gl_cv_func_strtoimax="guessing yes" ;;
-                    # Guess yes otherwise.
-            *)      gl_cv_func_strtoimax="guessing yes" ;;
+                               # Guess no on AIX 5.
+            aix5*)             gl_cv_func_strtoimax="guessing no" ;;
+                               # Guess yes on native Windows.
+            mingw* | windows*) gl_cv_func_strtoimax="guessing yes" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_strtoimax="guessing yes" ;;
           esac
          ])
       ])
diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 4c701ccc20..59f4701203 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,4 +1,4 @@
-# strtok_r.m4 serial 16
+# strtok_r.m4 serial 17
 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -42,11 +42,11 @@ AC_DEFUN([gl_FUNC_STRTOK_R]
          [gl_cv_func_strtok_r_works=yes],
          [gl_cv_func_strtok_r_works=no],
          [case "$host_os" in
-                           # Guess no on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;;
-                           # Guess yes on native Windows.
-            mingw*)        gl_cv_func_strtok_r_works="guessing yes" ;;
-            *)             gl_cv_func_strtok_r_works="guessing yes" ;;
+                               # Guess no on glibc systems.
+            *-gnu* | gnu*)     gl_cv_func_strtok_r_works="guessing no" ;;
+                               # Guess yes on native Windows.
+            mingw* | windows*) gl_cv_func_strtok_r_works="guessing yes" ;;
+            *)                 gl_cv_func_strtok_r_works="guessing yes" ;;
           esac
          ])
       ])
diff --git a/m4/strtol.m4 b/m4/strtol.m4
index b5ea56f229..17d00885e1 100644
--- a/m4/strtol.m4
+++ b/m4/strtol.m4
@@ -1,4 +1,4 @@
-# strtol.m4 serial 9
+# strtol.m4 serial 10
 dnl Copyright (C) 2002-2003, 2006, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,7 @@ AC_DEFUN([gl_FUNC_STRTOL]
          [gl_cv_func_strtol_works=no],
          [case "$host_os" in
                                 # Guess no on native Windows.
-            mingw*)             gl_cv_func_strtol_works="guessing no" ;;
+            mingw* | windows*)  gl_cv_func_strtol_works="guessing no" ;;
                                 # Guess no on glibc systems.
             *-gnu* | gnu*)      gl_cv_func_strtol_works="guessing no" ;;
                                 # Guess no on musl systems.
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index a0cbc805bc..8dc7bf488b 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,4 +1,4 @@
-# strtoll.m4 serial 11
+# strtoll.m4 serial 12
 dnl Copyright (C) 2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,7 @@ AC_DEFUN([gl_FUNC_STRTOLL]
          [gl_cv_func_strtoll_works=no],
          [case "$host_os" in
                                 # Guess no on native Windows.
-            mingw*)             gl_cv_func_strtoll_works="guessing no" ;;
+            mingw* | windows*)  gl_cv_func_strtoll_works="guessing no" ;;
                                 # Guess no on glibc systems.
             *-gnu* | gnu*)      gl_cv_func_strtoll_works="guessing no" ;;
                                 # Guess no on musl systems.
diff --git a/m4/strtoul.m4 b/m4/strtoul.m4
index 9baa9729e6..200b85bd0e 100644
--- a/m4/strtoul.m4
+++ b/m4/strtoul.m4
@@ -1,4 +1,4 @@
-# strtoul.m4 serial 7
+# strtoul.m4 serial 8
 dnl Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_STRTOUL]
          [gl_cv_func_strtoul_works=no],
          [case "$host_os" in
                                 # Guess no on native Windows.
-            mingw*)             gl_cv_func_strtoul_works="guessing no" ;;
+            mingw* | windows*)  gl_cv_func_strtoul_works="guessing no" ;;
                                 # Guess no on glibc systems.
             *-gnu* | gnu*)      gl_cv_func_strtoul_works="guessing no" ;;
                                 # Guess no on musl systems.
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 4f895c76af..297c8502fe 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,4 +1,4 @@
-# strtoull.m4 serial 10
+# strtoull.m4 serial 11
 dnl Copyright (C) 2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_STRTOULL]
          [gl_cv_func_strtoull_works=no],
          [case "$host_os" in
                                 # Guess no on native Windows.
-            mingw*)             gl_cv_func_strtoull_works="guessing no" ;;
+            mingw* | windows*)  gl_cv_func_strtoull_works="guessing no" ;;
                                 # Guess no on glibc systems.
             *-gnu* | gnu*)      gl_cv_func_strtoull_works="guessing no" ;;
                                 # Guess no on musl systems.
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index 1fc5777e97..303382881a 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 38
+# threadlib.m4 serial 39
 dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -85,7 +85,7 @@ AC_DEFUN([gl_WEAK_SYMBOLS]
   AC_CACHE_CHECK([whether imported symbols can be declared weak],
     [gl_cv_have_weak],
     [case "$host_os" in
-       cygwin* | mingw*)
+       cygwin* | mingw* | windows*)
          dnl On Cygwin 3.2.0 with gcc 10.2, and likewise on mingw 10.0.0 with
          dnl gcc 11.3, the test below would succeed, but programs that use
          dnl pthread_in_use() with weak symbol references crash miserably at
@@ -344,7 +344,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY]
     AC_CHECK_HEADERS_ONCE([threads.h])
 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         LIBSTDTHREAD=
         ;;
       *)
@@ -465,7 +465,7 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY]
                esac
                ;;
          dnl Obey gl_AVOID_WINPTHREAD on mingw.
-         mingw*)
+         mingw* | windows*)
                case "$gl_use_winpthreads_default" in
                  yes) gl_use_threads=posix ;;
                  no)  gl_use_threads=windows ;;
@@ -564,7 +564,7 @@ AC_DEFUN([gl_THREADLIB_BODY]
       case "$gl_use_threads" in
         yes | windows | win32) # The 'win32' is for backward compatibility.
           if { case "$host_os" in
-                 mingw*) true;;
+                 mingw* | windows*) true;;
                  *) false;;
                esac
              }; then
diff --git a/m4/time.m4 b/m4/time.m4
index 4c4e411736..3217a1a1ad 100644
--- a/m4/time.m4
+++ b/m4/time.m4
@@ -1,4 +1,4 @@
-# time.m4 serial 3
+# time.m4 serial 4
 dnl Copyright (C) 2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,9 +31,9 @@ AC_DEFUN([gl_FUNC_TIME]
            [gl_cv_func_time_works="guessing no"],
            [gl_cv_func_time_works="guessing yes"])
          ;;
-       aix*)   gl_cv_func_time_works="guessing no";;
-       mingw*) gl_cv_func_time_works="guessing no";;
-       *) gl_cv_func_time_works="guessing yes";;
+       aix*)              gl_cv_func_time_works="guessing no";;
+       mingw* | windows*) gl_cv_func_time_works="guessing no";;
+       *)                 gl_cv_func_time_works="guessing yes";;
      esac
     ])
   case "$gl_cv_func_time_works" in
diff --git a/m4/trunc.m4 b/m4/trunc.m4
index 287fb67133..c7d4f8f687 100644
--- a/m4/trunc.m4
+++ b/m4/trunc.m4
@@ -1,4 +1,4 @@
-# trunc.m4 serial 16
+# trunc.m4 serial 17
 dnl Copyright (C) 2007, 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -77,7 +77,7 @@ AC_DEFUN([gl_FUNC_TRUNC]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_trunc_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_trunc_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_trunc_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_trunc_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/truncate.m4 b/m4/truncate.m4
index fe9fdbf408..6d7db8943b 100644
--- a/m4/truncate.m4
+++ b/m4/truncate.m4
@@ -1,4 +1,4 @@
-# truncate.m4 serial 5   -*- Autoconf -*-
+# truncate.m4 serial 6   -*- Autoconf -*-
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_TRUNCATE]
   if test $ac_cv_have_decl_truncate = yes; then
     m4_ifdef([gl_LARGEFILE], [
       case "$host_os" in
-        mingw*)
+        mingw* | windows*)
           dnl Native Windows, and Large File Support is requested.
           dnl The mingw64 truncate64() function is based on ftruncate64(),
           dnl which is unreliable (it may delete the file, see
diff --git a/m4/truncf.m4 b/m4/truncf.m4
index 71469946ed..768c3a1cdf 100644
--- a/m4/truncf.m4
+++ b/m4/truncf.m4
@@ -1,4 +1,4 @@
-# truncf.m4 serial 16
+# truncf.m4 serial 17
 dnl Copyright (C) 2007, 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -77,7 +77,7 @@ AC_DEFUN([gl_FUNC_TRUNCF]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_truncf_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_truncf_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_truncf_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_truncf_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/truncl.m4 b/m4/truncl.m4
index 57bec00f0a..4e3351d574 100644
--- a/m4/truncl.m4
+++ b/m4/truncl.m4
@@ -1,4 +1,4 @@
-# truncl.m4 serial 18
+# truncl.m4 serial 19
 dnl Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,10 +64,10 @@ AC_DEFUN([gl_FUNC_TRUNCL]
           [gl_cv_func_truncl_works=yes],
           [gl_cv_func_truncl_works=no],
           [case "$host_os" in
-             osf4*)  gl_cv_func_truncl_works="guessing no" ;;
-                     # Guess yes on native Windows.
-             mingw*) gl_cv_func_truncl_works="guessing yes" ;;
-             *)      gl_cv_func_truncl_works="guessing yes" ;;
+             osf4*)             gl_cv_func_truncl_works="guessing no" ;;
+                                # Guess yes on native Windows.
+             mingw* | windows*) gl_cv_func_truncl_works="guessing yes" ;;
+             *)                 gl_cv_func_truncl_works="guessing yes" ;;
            esac
           ])
       ])
@@ -110,7 +110,7 @@ AC_DEFUN([gl_FUNC_TRUNCL]
                                      # Guess yes on musl systems.
                  *-musl* | midipix*) gl_cv_func_truncl_ieee="guessing yes" ;;
                                      # Guess yes on native Windows.
-                 mingw*)             gl_cv_func_truncl_ieee="guessing yes" ;;
+                 mingw* | windows*)  gl_cv_func_truncl_ieee="guessing yes" ;;
                                      # If we don't know, obey 
--enable-cross-guesses.
                  *)                  
gl_cv_func_truncl_ieee="$gl_cross_guess_normal" ;;
                esac
diff --git a/m4/tsearch.m4 b/m4/tsearch.m4
index c2ddc8a71e..2213d56eef 100644
--- a/m4/tsearch.m4
+++ b/m4/tsearch.m4
@@ -1,4 +1,4 @@
-# tsearch.m4 serial 12
+# tsearch.m4 serial 13
 dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,10 +39,10 @@ AC_DEFUN([gl_FUNC_TSEARCH]
   return result;
 }]])], [gl_cv_func_tdelete_works=yes], [gl_cv_func_tdelete_works=no],
             [case "$host_os" in
-               openbsd*) gl_cv_func_tdelete_works="guessing no" ;;
-                         # Guess yes on native Windows.
-               mingw*)   gl_cv_func_tdelete_works="guessing yes" ;;
-               *)        gl_cv_func_tdelete_works="guessing yes" ;;
+               openbsd*)            gl_cv_func_tdelete_works="guessing no" ;;
+                                    # Guess yes on native Windows.
+               mingw* | windows*)   gl_cv_func_tdelete_works="guessing yes" ;;
+               *)                   gl_cv_func_tdelete_works="guessing yes" ;;
              esac
             ])
       ])
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 45e9233971..0b87939373 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,4 +1,4 @@
-# serial 17
+# serial 18
 
 # Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -12,6 +12,6 @@ AC_DEFUN([gl_FUNC_TZSET]
   AC_REQUIRE([gl_TIME_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) REPLACE_TZSET=1 ;;
+    mingw* | windows*) REPLACE_TZSET=1 ;;
   esac
 ])
diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
index 77274778f3..72bf4a7ffe 100644
--- a/m4/ungetc.m4
+++ b/m4/ungetc.m4
@@ -1,4 +1,4 @@
-# ungetc.m4 serial 11
+# ungetc.m4 serial 12
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -49,7 +49,7 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS]
                                # Guess yes on bionic systems.
            *-android*)         gl_cv_func_ungetc_works="guessing yes" ;;
                                # Guess yes on native Windows.
-           mingw*)             gl_cv_func_ungetc_works="guessing yes" ;;
+           mingw* | windows*)  gl_cv_func_ungetc_works="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
            *)                  
gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;;
          esac
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index 27f103e78a..b225c2a285 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,4 +1,4 @@
-#serial 15
+#serial 16
 
 dnl From J. David Anglin.
 
@@ -31,9 +31,9 @@ AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT]
         [gl_cv_func_unlink_busy_text=yes],
         [gl_cv_func_unlink_busy_text=no],
         [case "$host_os" in
-                   # Guess no on native Windows.
-           mingw*) gl_cv_func_unlink_busy_text="guessing no" ;;
-           *)      gl_cv_func_unlink_busy_text="guessing no" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_unlink_busy_text="guessing no" ;;
+           *)                 gl_cv_func_unlink_busy_text="guessing no" ;;
          esac
         ]
       )
diff --git a/m4/unlink.m4 b/m4/unlink.m4
index 1fecaac520..13ca2d2af3 100644
--- a/m4/unlink.m4
+++ b/m4/unlink.m4
@@ -1,4 +1,4 @@
-# unlink.m4 serial 16
+# unlink.m4 serial 17
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -43,16 +43,16 @@ AC_DEFUN([gl_FUNC_UNLINK]
       [gl_cv_func_unlink_honors_slashes=yes],
       [gl_cv_func_unlink_honors_slashes=no],
       [case "$host_os" in
-                          # Guess yes on Linux systems.
-         linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
-                          # Guess yes on systems that emulate the Linux system 
calls.
-         midipix*)        gl_cv_func_unlink_honors_slashes="guessing yes" ;;
-                          # Guess yes on glibc systems.
-         *-gnu*)          gl_cv_func_unlink_honors_slashes="guessing yes" ;;
-                          # Guess no on native Windows.
-         mingw*)          gl_cv_func_unlink_honors_slashes="guessing no" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-         *)               
gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;;
+                            # Guess yes on Linux systems.
+         linux-* | linux)   gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+                            # Guess yes on systems that emulate the Linux 
system calls.
+         midipix*)          gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+                            # Guess yes on glibc systems.
+         *-gnu*)            gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+                            # Guess no on native Windows.
+         mingw* | windows*) gl_cv_func_unlink_honors_slashes="guessing no" ;;
+                            # If we don't know, obey --enable-cross-guesses.
+         *)                 
gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;;
        esac
       ])
      rm -f conftest.file conftest.lnk])
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index c3a9cfdaf7..b60646ef8e 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,4 +1,4 @@
-# serial 7
+# serial 8
 
 # Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc.
 #
@@ -25,7 +25,7 @@ AC_DEFUN([gl_UNLINKDIR]
   linux-* | linux | \
   freebsd2.2* | freebsd[[3-9]]* | freebsd[[1-9]][[0-9]]* | \
   cygwin | \
-  mingw*)
+  mingw* | windows*)
     AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1],
       [Define to 1 if unlink (dir) cannot possibly succeed.]);;
   esac
diff --git a/m4/usleep.m4 b/m4/usleep.m4
index d90422447f..9745fae8b2 100644
--- a/m4/usleep.m4
+++ b/m4/usleep.m4
@@ -1,4 +1,4 @@
-# usleep.m4 serial 8
+# usleep.m4 serial 9
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -29,16 +29,16 @@ AC_DEFUN([gl_FUNC_USLEEP]
 ]], [[return !!usleep (1000000);]])],
         [gl_cv_func_usleep_works=yes], [gl_cv_func_usleep_works=no],
         [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_usleep_works="guessing yes" ;;
-                          # Guess yes on systems that emulate the Linux system 
calls.
-           midipix*)      gl_cv_func_usleep_works="guessing yes" ;;
-                          # Guess no on native Windows.
-           mingw*)        gl_cv_func_usleep_works="guessing no" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_usleep_works="$gl_cross_guess_normal" ;;
+                              # Guess yes on glibc systems.
+           *-gnu* | gnu*)     gl_cv_func_usleep_works="guessing yes" ;;
+                              # Guess yes on musl systems.
+           *-musl*)           gl_cv_func_usleep_works="guessing yes" ;;
+                              # Guess yes on systems that emulate the Linux 
system calls.
+           midipix*)          gl_cv_func_usleep_works="guessing yes" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_usleep_works="guessing no" ;;
+                              # If we don't know, obey --enable-cross-guesses.
+           *)                 gl_cv_func_usleep_works="$gl_cross_guess_normal" 
;;
          esac
         ])])
     case "$gl_cv_func_usleep_works" in
diff --git a/m4/utime.m4 b/m4/utime.m4
index 4c0443ae8a..2a3b3909a4 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,4 +1,4 @@
-# utime.m4 serial 4
+# utime.m4 serial 5
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_UTIME]
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([lstat])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl On this platform, the original utime() or _utime() produces
       dnl timestamps that are affected by the time zone.
       dnl Use the function name 'rpl_utime' always, in order to avoid a
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 73b9a2da34..4d21f41dd4 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,5 +1,5 @@
 # Detect some bugs in glibc's implementation of utimes.
-# serial 8
+# serial 9
 
 dnl Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -144,11 +144,11 @@ AC_DEFUN([gl_FUNC_UTIMES]
        [gl_cv_func_working_utimes=yes],
        [gl_cv_func_working_utimes=no],
        [case "$host_os" in
-                   # Guess yes on musl systems.
-          *-musl*) gl_cv_func_working_utimes="guessing yes" ;;
-                   # Guess no on native Windows.
-          mingw*)  gl_cv_func_working_utimes="guessing no" ;;
-          *)       gl_cv_func_working_utimes="$gl_cross_guess_normal" ;;
+                             # Guess yes on musl systems.
+          *-musl*)           gl_cv_func_working_utimes="guessing yes" ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) gl_cv_func_working_utimes="guessing no" ;;
+          *)                 
gl_cv_func_working_utimes="$gl_cross_guess_normal" ;;
         esac
        ])
     ])
diff --git a/m4/waitpid.m4 b/m4/waitpid.m4
index b001062193..ff100b382c 100644
--- a/m4/waitpid.m4
+++ b/m4/waitpid.m4
@@ -1,4 +1,4 @@
-# waitpid.m4 serial 2
+# waitpid.m4 serial 3
 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,6 @@ AC_DEFUN([gl_FUNC_WAITPID]
   AC_REQUIRE([AC_CANONICAL_HOST])
   HAVE_WAITPID=1
   case $host_os in
-    mingw*) HAVE_WAITPID=0 ;;
+    mingw* | windows*) HAVE_WAITPID=0 ;;
   esac
 ])
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index fa503b5335..3152b37563 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,4 +1,4 @@
-# wcrtomb.m4 serial 18
+# wcrtomb.m4 serial 19
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -82,9 +82,11 @@ AC_DEFUN([gl_FUNC_WCRTOMB]
 changequote(,)dnl
           case "$host_os" in
             # Guess no on AIX 4, OSF/1, Solaris, native Windows.
-            aix4* | osf* | solaris* | mingw*) 
gl_cv_func_wcrtomb_retval="guessing no" ;;
+            aix4* | osf* | solaris* | mingw* | windows*)
+              gl_cv_func_wcrtomb_retval="guessing no" ;;
             # Guess yes otherwise.
-            *)                                
gl_cv_func_wcrtomb_retval="guessing yes" ;;
+            *)
+              gl_cv_func_wcrtomb_retval="guessing yes" ;;
           esac
 changequote([,])dnl
           if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test 
$LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
diff --git a/m4/wcsftime.m4 b/m4/wcsftime.m4
index ce8a8f4cac..2a7be1a952 100644
--- a/m4/wcsftime.m4
+++ b/m4/wcsftime.m4
@@ -1,4 +1,4 @@
-# wcsftime.m4 serial 1
+# wcsftime.m4 serial 2
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_WCSFTIME]
     HAVE_WCSFTIME=0
   else
     case "$host_os" in
-      mingw*) REPLACE_WCSFTIME=1 ;;
+      mingw* | windows*) REPLACE_WCSFTIME=1 ;;
     esac
   fi
 ])
diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4
index 776f465156..c36e0fa3b6 100644
--- a/m4/wcsrtombs.m4
+++ b/m4/wcsrtombs.m4
@@ -1,4 +1,4 @@
-# wcsrtombs.m4 serial 13
+# wcsrtombs.m4 serial 14
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,12 +64,12 @@ AC_DEFUN([gl_WCSRTOMBS_TERMINATION]
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                # Guess no on OSF/1.
-        osf*)   gl_cv_func_wcsrtombs_termination="guessing no" ;;
-                # Guess yes on native Windows.
-        mingw*) gl_cv_func_wcsrtombs_termination="guessing yes" ;;
-                # Guess yes otherwise.
-        *)      gl_cv_func_wcsrtombs_termination="guessing yes" ;;
+                           # Guess no on OSF/1.
+        osf*)              gl_cv_func_wcsrtombs_termination="guessing no" ;;
+                           # Guess yes on native Windows.
+        mingw* | windows*) gl_cv_func_wcsrtombs_termination="guessing yes" ;;
+                           # Guess yes otherwise.
+        *)                 gl_cv_func_wcsrtombs_termination="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR != none; then
@@ -121,12 +121,15 @@ AC_DEFUN([gl_WCSRTOMBS_NULL]
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                               # Guess no on HP-UX, OSF/1, mingw.
-        hpux* | osf* | mingw*) gl_cv_func_wcsrtombs_null="guessing no" ;;
-                               # Guess yes on native Windows.
-        mingw*)                gl_cv_func_wcsrtombs_null="guessing yes" ;;
-                               # Guess yes otherwise.
-        *)                     gl_cv_func_wcsrtombs_null="guessing yes" ;;
+          # Guess no on HP-UX, OSF/1, mingw.
+        hpux* | osf* | mingw* | windows*)
+          gl_cv_func_wcsrtombs_null="guessing no" ;;
+          # Guess yes on native Windows.
+        mingw* | windows*)
+          gl_cv_func_wcsrtombs_null="guessing yes" ;;
+          # Guess yes otherwise.
+        *)
+          gl_cv_func_wcsrtombs_null="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR != none; then
diff --git a/m4/wctob.m4 b/m4/wctob.m4
index 90042a52b4..c51b16f901 100644
--- a/m4/wctob.m4
+++ b/m4/wctob.m4
@@ -1,4 +1,4 @@
-# wctob.m4 serial 13
+# wctob.m4 serial 14
 dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_WCTOB]
           solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
             gl_cv_func_wctob_works="guessing no" ;;
             # Guess no on native Windows.
-          mingw*)
+          mingw* | windows*)
             gl_cv_func_wctob_works="guessing no" ;;
             # Guess yes otherwise.
           *) gl_cv_func_wctob_works="guessing yes" ;;
diff --git a/m4/wctype.m4 b/m4/wctype.m4
index 321bd696fb..ad78c8b166 100644
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -1,4 +1,4 @@
-# wctype.m4 serial 4
+# wctype.m4 serial 5
 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,10 +30,10 @@ AC_DEFUN_ONCE([gl_FUNC_WCTYPE]
          ]])],
          [gl_cv_func_wctype_works=yes], [gl_cv_func_wctype_works=no],
          [case "$host_os" in
-                    # Guess no on native Windows.
-            mingw*) gl_cv_func_wctype_works="guessing no" ;;
-                    # Guess yes otherwise.
-            *)      gl_cv_func_wctype_works="guessing yes" ;;
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_wctype_works="guessing no" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_wctype_works="guessing yes" ;;
           esac
          ])
       ])
diff --git a/m4/windows-stat-inodes.m4 b/m4/windows-stat-inodes.m4
index ac0d1e68ec..0651d076fe 100644
--- a/m4/windows-stat-inodes.m4
+++ b/m4/windows-stat-inodes.m4
@@ -1,4 +1,4 @@
-# windows-stat-inodes.m4 serial 1
+# windows-stat-inodes.m4 serial 2
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_WINDOWS_STAT_INODES]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) WINDOWS_STAT_INODES=1 ;;
-    *)      WINDOWS_STAT_INODES=0 ;;
+    mingw* | windows*) WINDOWS_STAT_INODES=1 ;;
+    *)                 WINDOWS_STAT_INODES=0 ;;
   esac
 ])
diff --git a/m4/windows-stat-timespec.m4 b/m4/windows-stat-timespec.m4
index 2bb2ea9306..10c358c4d3 100644
--- a/m4/windows-stat-timespec.m4
+++ b/m4/windows-stat-timespec.m4
@@ -1,4 +1,4 @@
-# windows-stat-timespec.m4 serial 1
+# windows-stat-timespec.m4 serial 2
 dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_WINDOWS_STAT_TIMESPEC]
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*) WINDOWS_STAT_TIMESPEC=1 ;;
-    *)      WINDOWS_STAT_TIMESPEC=0 ;;
+    mingw* | windows*) WINDOWS_STAT_TIMESPEC=1 ;;
+    *)                 WINDOWS_STAT_TIMESPEC=0 ;;
   esac
 ])
diff --git a/modules/at-internal b/modules/at-internal
index 2a37779f72..0d17b9339a 100644
--- a/modules/at-internal
+++ b/modules/at-internal
@@ -9,7 +9,7 @@ Depends-on:
 errno
 fcntl-h
 intprops
-open       [case $host_os in mingw*) false;; *) :;; esac]
+open       [case $host_os in mingw* | windows*) false;; *) :;; esac]
 sys_stat
 unistd
 
diff --git a/modules/fstat b/modules/fstat
index 394f2fa4ed..ddc26eb6f6 100644
--- a/modules/fstat
+++ b/modules/fstat
@@ -22,7 +22,7 @@ gl_FUNC_FSTAT
 gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1])
 AM_COND_IF([GL_COND_OBJ_FSTAT], [
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_LIBOBJ([stat-w32])
       ;;
   esac
diff --git a/modules/getloadavg b/modules/getloadavg
index fcd4352d28..93b1d92e38 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -8,7 +8,7 @@ m4/getloadavg.m4
 Depends-on:
 extensions
 intprops  [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1]
-open      [case $host_os in mingw*) false;; *) test $HAVE_GETLOADAVG = 0 || 
test $REPLACE_GETLOADAVG = 1;; esac]
+open      [case $host_os in mingw* | windows*) false;; *) test 
$HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1;; esac]
 stdbool   [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1]
 stdlib    [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1]
 
diff --git a/modules/getrandom b/modules/getrandom
index a8b14781d0..d8503bae2a 100644
--- a/modules/getrandom
+++ b/modules/getrandom
@@ -10,7 +10,7 @@ sys_random
 fcntl-h             [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
 minmax              [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
 stdbool             [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
-open                [case $host_os in mingw*) false;; *) test $HAVE_GETRANDOM 
= 0 || test $REPLACE_GETRANDOM = 1;; esac]
+open                [case $host_os in mingw* | windows*) false;; *) test 
$HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1;; esac]
 
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
diff --git a/modules/stat b/modules/stat
index 0d01ab6055..b6b7d28722 100644
--- a/modules/stat
+++ b/modules/stat
@@ -22,7 +22,7 @@ gl_FUNC_STAT
 gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1])
 AM_COND_IF([GL_COND_OBJ_STAT], [
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_LIBOBJ([stat-w32])
       ;;
   esac
diff --git a/modules/windows-cond b/modules/windows-cond
index d9c1aa6605..e0335c3590 100644
--- a/modules/windows-cond
+++ b/modules/windows-cond
@@ -15,7 +15,7 @@ gettimeofday
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_COND],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_COND
diff --git a/modules/windows-mutex b/modules/windows-mutex
index 67e54c1b8d..a825ad85cd 100644
--- a/modules/windows-mutex
+++ b/modules/windows-mutex
@@ -11,7 +11,7 @@ Depends-on:
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_MUTEX
diff --git a/modules/windows-once b/modules/windows-once
index b41cfacbe0..c5672e2125 100644
--- a/modules/windows-once
+++ b/modules/windows-once
@@ -10,7 +10,7 @@ Depends-on:
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_ONCE
diff --git a/modules/windows-recmutex b/modules/windows-recmutex
index e1d858a327..c7367fd1fe 100644
--- a/modules/windows-recmutex
+++ b/modules/windows-recmutex
@@ -11,7 +11,7 @@ Depends-on:
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_RECMUTEX
diff --git a/modules/windows-rwlock b/modules/windows-rwlock
index 28cc3b93dc..ef5f938833 100644
--- a/modules/windows-rwlock
+++ b/modules/windows-rwlock
@@ -11,7 +11,7 @@ Depends-on:
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_RWLOCK
diff --git a/modules/windows-spawn b/modules/windows-spawn
index d9415fcb87..2b0c7ccf3c 100644
--- a/modules/windows-spawn
+++ b/modules/windows-spawn
@@ -18,7 +18,7 @@ malloc-posix
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_SPAWN],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_SPAWN
diff --git a/modules/windows-spin b/modules/windows-spin
index ef7f994020..6718d6dff4 100644
--- a/modules/windows-spin
+++ b/modules/windows-spin
@@ -10,7 +10,7 @@ Depends-on:
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_SPIN],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_SPIN
diff --git a/modules/windows-stat-override b/modules/windows-stat-override
index d8fb4eb032..5507bb8d93 100644
--- a/modules/windows-stat-override
+++ b/modules/windows-stat-override
@@ -15,7 +15,7 @@ configure.ac:
 gl_SYS_STAT_H_REQUIRE_DEFAULTS
 AC_REQUIRE([AC_CANONICAL_HOST])
 case "$host_os" in
-  mingw*) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT], 
[1]) ;;
+  mingw* | windows*) 
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT], [1]) ;;
 esac
 
 Makefile.am:
diff --git a/modules/windows-thread b/modules/windows-thread
index b036c2c4a9..ff10c396dc 100644
--- a/modules/windows-thread
+++ b/modules/windows-thread
@@ -12,7 +12,7 @@ windows-tls
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_THREAD],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_THREAD
diff --git a/modules/windows-timedmutex b/modules/windows-timedmutex
index c3ed4420b1..1d74bdf5ef 100644
--- a/modules/windows-timedmutex
+++ b/modules/windows-timedmutex
@@ -14,7 +14,7 @@ gettimeofday
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDMUTEX],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_TIMEDMUTEX
diff --git a/modules/windows-timedrecmutex b/modules/windows-timedrecmutex
index f61c9e1d0f..0bc73f4ab3 100644
--- a/modules/windows-timedrecmutex
+++ b/modules/windows-timedrecmutex
@@ -14,7 +14,7 @@ gettimeofday
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDRECMUTEX],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_TIMEDRECMUTEX
diff --git a/modules/windows-timedrwlock b/modules/windows-timedrwlock
index bd77756033..20242ed53c 100644
--- a/modules/windows-timedrwlock
+++ b/modules/windows-timedrwlock
@@ -15,7 +15,7 @@ gettimeofday
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TIMEDRWLOCK],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_TIMEDRWLOCK
diff --git a/modules/windows-tls b/modules/windows-tls
index 2e229940cc..3fe2137bac 100644
--- a/modules/windows-tls
+++ b/modules/windows-tls
@@ -11,7 +11,7 @@ windows-once
 configure.ac:
 AC_REQUIRE([AC_CANONICAL_HOST])
 gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TLS],
-               [case "$host_os" in mingw*) true;; *) false;; esac])
+               [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
 
 Makefile.am:
 if GL_COND_OBJ_WINDOWS_TLS






reply via email to

[Prev in Thread] Current Thread [Next in Thread]