From 0396e69dbefb3630651d93e0a7526c4326a071bb Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 17 Apr 2012 08:33:41 -0500 Subject: [PATCH] Resolve __vector namespace conflict with Altivec. --- ChangeLog | 5 +++++ 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 + + * include/sys/uio.h: Change __vector to __iovec to avoid clash + with altivec. + 2012-04-16 Marek Polacek * 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 -- 2.11.4.GIT