about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRyan Arnold <ryanarn@etna.rchland.ibm.com>2010-05-11 09:48:21 -0500
committerRyan Arnold <ryanarn@etna.rchland.ibm.com>2010-05-11 09:48:21 -0500
commitbcb75669959f740e04208b773e99d87c5342dc34 (patch)
tree44c0f00684c9483ac7e8a4fbfd8d1557028c22e1
parentec10a41982e257e9829c54eb0092dd9fac91a149 (diff)
downloadglibc-bcb75669959f740e04208b773e99d87c5342dc34.tar.gz
glibc-bcb75669959f740e04208b773e99d87c5342dc34.tar.xz
glibc-bcb75669959f740e04208b773e99d87c5342dc34.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--include/sys/uio.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3158003125..ac5a5b853b 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-02-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #11230]
diff --git a/include/sys/uio.h b/include/sys/uio.h
index 8c2b0167c1..bfaec5997e 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