--- ./gnulib/import/sys_stat.in.h~0	2020-06-29 04:47:10.000000000 +0300
+++ ./gnulib/import/sys_stat.in.h	2020-06-29 11:58:43.689381700 +0300
@@ -75,7 +75,7 @@
 #endif
 
 /* Large File Support on native Windows.  */
-#if @WINDOWS_64_BIT_ST_SIZE@
+#if 0
 # define stat _stati64
 #endif
 
@@ -436,7 +436,7 @@ _GL_CXXALIASWARN (fstat);
 #elif @GNULIB_OVERRIDES_STRUCT_STAT@
 # undef fstat
 # define fstat fstat_used_without_requesting_gnulib_module_fstat
-#elif @WINDOWS_64_BIT_ST_SIZE@
+#elif 0
 /* Above, we define stat to _stati64.  */
 # define fstat _fstati64
 #elif defined GNULIB_POSIXCHECK
@@ -724,7 +724,7 @@ _GL_WARN_ON_USE (mknodat, "mknodat is no
         so we have to replace stat64() instead of stat(). */
 #    undef stat64
 #    define stat64(name, st) rpl_stat (name, st)
-#   elif @WINDOWS_64_BIT_ST_SIZE@
+#   elif 0
      /* Above, we define stat to _stati64.  */
 #    if defined __MINGW32__ && defined _stati64
 #     ifndef _USE_32BIT_TIME_T

--- gnulib/import/glob.c~	2021-03-25 03:47:10.000000000 +0200
+++ gnulib/import/glob.c	2021-03-29 12:48:20.907625000 +0300
@@ -881,7 +881,15 @@ __glob (const char *pattern, int flags, 
               }
             scratch_buffer_free (&pwtmpbuf);
           }
-#endif /* !WINDOWS32 */
+#else  /* WINDOWS32 */
+	  /* We don't support ~USER on MS-Windows (FIXME: could have
+	     at least supported that if USER == $USERNAME).  */
+	  if (flags & GLOB_TILDE_CHECK)
+	    {
+	      retval = GLOB_NOMATCH;
+	      goto out;
+	    }
+#endif /* WINDOWS32 */
         }
     }
 
--- gnulib/import/unistd.in.h~	2021-03-29 09:15:08.782625000 +0300
+++ gnulib/import/unistd.in.h	2021-03-29 10:19:46.485750000 +0300
@@ -2540,7 +2540,11 @@
 #   undef swab
 #   define swab _swab
 #  endif
+#  if defined __MINGW32_VERSION
+_GL_CXXALIAS_MDA (swab, void, (const char *from, char *to, size_t n));
+#  else
 _GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n));
+#  endif
 # else
 _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n));
 # endif
