diff options
author | Ryan Arnold <ryanarn@etna.rchland.ibm.com> | 2010-05-11 09:48:21 -0500 |
---|---|---|
committer | Ryan S. Arnold <rsa@us.ibm.com> | 2011-05-10 18:58:15 -0500 |
commit | 0019b30b5db722ba7da0639a67b378ed323801fe (patch) | |
tree | 98b8517af2623c588763d016ef5f3b5b5e77d013 | |
parent | 8cbf6ed460ab45ecf46f98d017a5c1ab0fc213b4 (diff) | |
download | glibc-0019b30b5db722ba7da0639a67b378ed323801fe.zip glibc-0019b30b5db722ba7da0639a67b378ed323801fe.tar.gz glibc-0019b30b5db722ba7da0639a67b378ed323801fe.tar.bz2 |
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)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/sys/uio.h | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -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 8c2b016..bfaec59 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 |