[commits] r3748 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/eventfd_read.c sysdeps/unix/sysv/linux/eventfd_write.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Oct  9 00:04:24 2007
New Revision: 3748

Log:
Import glibc-mainline for 2007-10-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_read.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_write.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Oct  9 00:04:24 2007
@@ -1,3 +1,10 @@
+2007-10-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/eventfd_read.c (eventfd_read): Use
+	__read not read.
+	* sysdeps/unix/sysv/linux/eventfd_write.c (eventfd_write): Use
+	__write not write.
+
 2007-10-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #181]

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_read.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_read.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_read.c Tue Oct  9 00:04:24 2007
@@ -24,5 +24,5 @@
 int
 eventfd_read (int fd, eventfd_t *value)
 {
-  return read (fd, value, sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
+  return __read (fd, value, sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
 }

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_write.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_write.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/eventfd_write.c Tue Oct  9 00:04:24 2007
@@ -24,5 +24,6 @@
 int
 eventfd_write (int fd, eventfd_t value)
 {
-  return write (fd, &value, sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
+  return __write (fd, &value,
+		  sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
 }