mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Unbreak MinGW build broken by Gnulib merge

Browse source 
* lib/acl_entries.c (acl_entries): Make it no-op for MinGW, as it
was before.  Without this, acl_entries doesn't compile on MinGW.

* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_issymlink)
(OMIT_GNULIB_MODULE_issymlinkat): Disable these Gnulib modules.
This commit is contained in:
Eli Zaretskii 2025-11-05 17:51:42 +02:00
parent e7505ca213
commit d3101630ab
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/acl_entries.c
View file

@ -44,7 +44,7 @@ acl_entries (acl_t acl)
got_one >= 0; got_one >= 0;
got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace)) got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
count++; count++;
#else /* Linux, FreeBSD, NetBSD >= 10, Cygwin >= 2.5 */ #elif !defined __MINGW32__ /* Linux, FreeBSD, NetBSD >= 10, Cygwin >= 2.5 */
/* acl_get_entry returns 1 when it successfully fetches an entry, /* acl_get_entry returns 1 when it successfully fetches an entry,
and 0 at the end. */ and 0 at the end. */
acl_entry_t ace; acl_entry_t ace;

2
nt/gnulib-cfg.mk
View file

@ -59,6 +59,8 @@ OMIT_GNULIB_MODULE_futimens = true
OMIT_GNULIB_MODULE_getdelim = true OMIT_GNULIB_MODULE_getdelim = true
OMIT_GNULIB_MODULE_getline = true OMIT_GNULIB_MODULE_getline = true
OMIT_GNULIB_MODULE_inttypes-h-incomplete = true OMIT_GNULIB_MODULE_inttypes-h-incomplete = true
OMIT_GNULIB_MODULE_issymlink = true
OMIT_GNULIB_MODULE_issymlinkat = true
OMIT_GNULIB_MODULE_lchmod = true OMIT_GNULIB_MODULE_lchmod = true
OMIT_GNULIB_MODULE_malloc-gnu = true OMIT_GNULIB_MODULE_malloc-gnu = true
OMIT_GNULIB_MODULE_malloc-posix = true OMIT_GNULIB_MODULE_malloc-posix = true