diff options
| author | Petr Baudis <pasky@ucw.cz> | 2012-04-17 08:33:41 -0500 |
|---|---|---|
| committer | Ryan S. Arnold <rsa@linux.vnet.ibm.com> | 2012-04-17 08:39:57 -0500 |
| commit | 0396e69dbefb3630651d93e0a7526c4326a071bb (patch) | |
| tree | 6b60fe751df93884aca64fe0faaf3ba14a6521ab | |
| parent | 750b5926bc3c31f33852c011bff32ffaaf5da133 (diff) | |
| download | glibc-0396e69dbefb3630651d93e0a7526c4326a071bb.tar.gz glibc-0396e69dbefb3630651d93e0a7526c4326a071bb.tar.xz glibc-0396e69dbefb3630651d93e0a7526c4326a071bb.zip | |
Resolve __vector namespace conflict with Altivec.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/sys/uio.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8f7fa94fca..982ac14562 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 0ec9ab09a8..7d67d67c0a 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 |