From: Ryan Arnold <ryanarn@etna.rchland.ibm.com>
Date: Tue, 11 May 2010 14:48:21 +0000 (-0500)
Subject: This patch is not upstream.  It is useful and non-invasive.  It allows some
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e4977136127323e4306d24f2e32b4a1eb4b9d4b;p=thirdparty%2Fglibc.git

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 93f6ed4ec90..b46ff5c7fc3 100644
--- 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  Ryan S. Arnold  <rsa@us.ibm.com>
 
 	* config.h.in: Added HAVE_PPC64_PT_GNU_STACK which is set during a
diff --git a/include/sys/uio.h b/include/sys/uio.h
index 8c2b0167c18..bfaec5997e1 100644
--- 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