This patch is not upstream. It is useful and non-invasive. It allows some

recent versions of GCC to compile GLIBC when altivec is configured.

2009-11-06  Petr Baudis <pasky@suse.cz>

	* include/sys/uio.h: Change __vector to __iovec to avoid clash
	with altivec.
(cherry picked from commit bcb75669959f740e04208b773e99d87c5342dc34)

diff --git a/ChangeLog b/ChangeLog
index 1e3e0bf76e6c46e756caa1e1eb072edbc5679a3b..8e160ee80ab0d98ad814e9a899f7eb2bebf7584d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-06  Petr Baudis <pasky@suse.cz>
+
+       * include/sys/uio.h: Change __vector to __iovec to avoid clash
+       with altivec.
+
 2010-10-26  Peter Bergner  <bergner@vnet.ibm.com>
 
        * elf/rtld.c (process_envvars): Added conditional EXTRA_LD_ENVVARS_11

diff --git a/include/sys/uio.h b/include/sys/uio.h
index 8c2b0167c18292fc05f574e8e8b3f3b2a155a5e5..bfaec5997e1644ef54c72cd7371fbb6e6a2742ce 100644 (file)
--- a/include/sys/uio.h
+++ b/include/sys/uio.h
@@ -2,12 +2,12 @@
 #include <misc/sys/uio.h>
 
 /* 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