intl: Merge from glibc.

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

diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 7417046d03c8e7195e3c2f329542d6995317047c..0285a2df769a912092beed99538bf5529fe81770 100644 (file)
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -361,7 +361,7 @@
    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 read(fd, buf, n)      read_not_cancel (fd, buf, n)
+# 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)
 # define munmap(addr, len)     __munmap (addr, len)