From: Roland McGrath Date: Thu, 7 Oct 2004 18:43:52 +0000 (+0000) Subject: 2004-10-07 Andreas Schwab X-Git-Tag: cvs/fedora-glibc-20041012T1128~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce22661a6b4b632c4b6866207da2de0885df07ba;p=thirdparty%2Fglibc.git 2004-10-07 Andreas Schwab * misc/sys/uio.h: Change __vector to __iovec to avoid clash with altivec. --- diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 53add9f2e2c..1b203f71c2a 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -30,24 +30,24 @@ __BEGIN_DECLS /* Read data from file descriptor FD, and put the result in the - buffers described by VECTOR, which is a vector of COUNT `struct iovec's. + buffers described by IOVEC, which is a vector of COUNT `struct iovec's. The buffers are filled in the order specified. Operates just like `read' (see ) except that data are - put in VECTOR instead of a contiguous buffer. + put in IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t readv (int __fd, __const struct iovec *__vector, int __count); +extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count); -/* Write data pointed by the buffers described by VECTOR, which +/* Write data pointed by the buffers described by IOVEC, which is a vector of COUNT `struct iovec's, to file descriptor FD. The data is written in the order specified. Operates just like `write' (see ) except that the data - are taken from VECTOR instead of a contiguous buffer. + are taken from IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t writev (int __fd, __const struct iovec *__vector, int __count); +extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count); __END_DECLS