glibc 2003-09-03 Jakub Jelinek <jakub@redhat.com>

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 450d5cfd7f587c746ef046366e2d5af4a2c73762..1b6d89e2595f9c2384b385d3e4ca7e8247e7c04a 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * loadmsgcat.c (open, close, read, mmap, munmap): Define as
+       function-like macros.
+
 2003-09-02  Ulrich Drepper  <drepper@redhat.com>
 
        * loadmsgcat.c: For _LIBC, call not cancelable versions of open, close,

diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 3ab30a4b2bb8269dc555fd16143e1065847dda49..9569aa872fc7c68e0c7fc3f085888f1df55eeb6c 100644 (file)
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -458,11 +458,12 @@ 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_not_cancel_2
-# define close  close_not_cancel_no_status
-# define read   read_not_cancel
-# define mmap   __mmap
-# define munmap __munmap
+# define open(name, flags)     open_not_cancel_2 (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) \
+  __mmap (addr, len, prot, flags, fd, offset)
+# define munmap(addr, len)     __munmap (addr, len)
 #endif
 
 /* For those losing systems which don't have `alloca' we have to add