intl: Merge from glibc.

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

diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 14f009bb2382c9c3e9ae0900305b38a01604f52e..7417046d03c8e7195e3c2f329542d6995317047c 100644 (file)
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -359,7 +359,7 @@
 /* Rename the non ISO C functions.  This is required by the standard
    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_not_cancel_2 (name, flags)
+# 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 mmap(addr, len, prot, flags, fd, offset) \