intl: Merge from glibc.

Apply commit
2017-07-03  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Consolidate non cancellable close call

diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 0285a2df769a912092beed99538bf5529fe81770..60b4373486fac570d46797e63dc67c743c59e34a 100644 (file)
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -360,7 +360,7 @@
    because some ISO C functions will require linking with this object
    file and the name space must not be polluted.  */
 # define open(name, flags)     __open_nocancel (name, flags)
-# define close(fd)             close_not_cancel_no_status (fd)
+# define close(fd)             __close_nocancel_nostatus (fd)
 # define read(fd, buf, n)      __read_nocancel (fd, buf, n)
 # define mmap(addr, len, prot, flags, fd, offset) \
   __mmap (addr, len, prot, flags, fd, offset)