From cf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Mon, 8 Oct 2018 18:21:47 -0700
Subject: Update from Gnulib

This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
---
 admin/merge-gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'admin')

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index abb192911d9..575e3fa74a7 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -47,7 +47,7 @@ GNULIB_MODULES='
 
 AVOIDED_MODULES='
   btowc close dup fchdir fstat langinfo lock
-  malloc-posix mbrtowc mbsinit msvc-inval msvc-nothrow nl_langinfo
+  malloc-posix mbrtowc mbsinit mkdir msvc-inval msvc-nothrow nl_langinfo
   openat-die opendir raise
   save-cwd select setenv sigprocmask stat stdarg stdbool
   threadlib tzset unsetenv utime utime-h
-- 
cgit v1.2.1