From: Petr Baudis <pasky@ucw.cz>
Date: Tue, 17 Apr 2012 13:33:41 +0000 (-0500)
Subject: Resolve __vector namespace conflict with Altivec.
X-Git-Tag: glibc-2.16-tps~603
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0396e69dbefb3630651d93e0a7526c4326a071bb;p=thirdparty%2Fglibc.git

Resolve __vector namespace conflict with Altivec.
---

diff --git a/ChangeLog b/ChangeLog
index 8f7fa94fca5..982ac145621 100644
--- 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 0ec9ab09a87..7d67d67c0a3 100644
--- 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