Resolve __vector namespace conflict with Altivec.

diff --git a/ChangeLog b/ChangeLog
index 8f7fa94..982ac14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-17  Petr Baudis  <pasky@ucw.cz>
+
+       * include/sys/uio.h: Change __vector to __iovec to avoid clash
+       with altivec.
+
 2012-04-16  Marek Polacek  <polacek@redhat.com>
 
        * elf/pldd-xx.c: Rename static_assert to pldd_assert.

diff --git a/include/sys/uio.h b/include/sys/uio.h
index 0ec9ab0..7d67d67 100644 (file)
--- a/include/sys/uio.h
+++ b/include/sys/uio.h
@@ -3,13 +3,13 @@
 
 #ifndef _ISOMAC
 /* Now define the internal interfaces.  */
-extern ssize_t __readv (int __fd, const struct iovec *__vector,
+extern ssize_t __readv (int __fd, const struct iovec *__iovec,
                        int __count);
-extern ssize_t __libc_readv (int __fd, const struct iovec *__vector,
+extern ssize_t __libc_readv (int __fd, const struct iovec *__iovec,
                             int __count);
-extern ssize_t __writev (int __fd, const struct iovec *__vector,
+extern ssize_t __writev (int __fd, const struct iovec *__iovec,
                         int __count);
-extern ssize_t __libc_writev (int __fd, const struct iovec *__vector,
+extern ssize_t __libc_writev (int __fd, const struct iovec *__iovec,
                              int __count);
 #endif
 #endif