From: Bruno Haible <bruno@clisp.org>
Date: Wed, 11 May 2005 11:04:17 +0000 (+0000)
Subject: glibc 2003-09-02  Ulrich Drepper  <drepper@redhat.com>
X-Git-Tag: v0.15~526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bef47a0583d4c6e05ff097200459897ad1791b1;p=thirdparty%2Fgettext.git

glibc 2003-09-02  Ulrich Drepper  <drepper@redhat.com>
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index da303d014..450d5cfd7 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* loadmsgcat.c: For _LIBC, call not cancelable versions of open, close,
+	and read.
+
 2003-06-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* localealias.c (read_alias_file): Determine whether line is read
diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 30c4e011c..3ab30a4b2 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -91,6 +91,7 @@ char *alloca ();
 
 #ifdef _LIBC
 # include "../locale/localeinfo.h"
+# include <not-cancel.h>
 #endif
 
 /* Provide fallback values for macros that ought to be defined in <inttypes.h>.
@@ -457,9 +458,9 @@ char *alloca ();
 /* 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   __open
-# define close  __close
-# define read   __read
+# define open   open_not_cancel_2
+# define close  close_not_cancel_no_status
+# define read   read_not_cancel
 # define mmap   __mmap
 # define munmap __munmap
 #endif