From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 18 Dec 2024 19:16:07 +0000 (+0200)
Subject: Avoid MinGW compilation warning in lib/
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3df5efbc5a91a73ed703bbde01bdc5bf4215f3e;p=emacs.git

Avoid MinGW compilation warning in lib/

* nt/mingw-cfg.site (ac_cv_func_malloc_0_nonnull)
(gl_cv_malloc_ptrdiff, gl_cv_func_malloc_posix):
* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_malloc-gnu): Set to avoid
compiling lib/malloc.c, which is not needed and causes a
compilation warning.

(cherry picked from commit 807b6172524a7b4f3fe19bc22a06afd48cc57b71)
---

diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index 048f812724a..c18a1d8e470 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -63,6 +63,7 @@ OMIT_GNULIB_MODULE_getdelim = true
 OMIT_GNULIB_MODULE_getline = true
 OMIT_GNULIB_MODULE_inttypes-incomplete = true
 OMIT_GNULIB_MODULE_lchmod = true
+OMIT_GNULIB_MODULE_malloc-gnu = true
 OMIT_GNULIB_MODULE_malloc-posix = true
 OMIT_GNULIB_MODULE_nanosleep = true
 OMIT_GNULIB_MODULE_nproc = true
diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index 9962cc46642..16b61de3bd0 100644
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -167,6 +167,11 @@ ac_cv_func_strsignal=no
 # implementation of 'free' doesn't touch errno, and it emits a
 # compilation warning.
 gl_cv_func_free_preserves_errno=yes
+# Don't build the Gnulib malloc.c: it is not needed, and it emits a
+# compilation warning.
+ac_cv_func_malloc_0_nonnull=yes
+gl_cv_malloc_ptrdiff=yes
+gl_cv_func_malloc_posix=yes
 # Don't build the Gnulib nanosleep module: it requires W2K or later,
 # and MinGW does have nanosleep.
 gl_cv_func_nanosleep=yes