diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-03-08 09:36:11 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-03-08 09:36:11 +0000 |
| commit | 75543537a16a0911af61045a96926cdb81f51383 (patch) | |
| tree | 34fa443cb5d7c48e058d17cb2605e10d3947b521 /winsup/cygwin/fhandler.cc | |
| parent | 106833e9b360c8f56e465e2e80141a13dc193635 (diff) | |
| download | cygnal-75543537a16a0911af61045a96926cdb81f51383.tar.gz cygnal-75543537a16a0911af61045a96926cdb81f51383.tar.bz2 cygnal-75543537a16a0911af61045a96926cdb81f51383.zip | |
* Throughout, replace usage of w32api's min with MIN from sys/param.h.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index c3bca4f7d..d0210f83b 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -14,6 +14,7 @@ details. */ #include <stdlib.h> #include <sys/uio.h> #include <sys/acl.h> +#include <sys/param.h> #include "cygerrno.h" #include "perprocess.h" #include "security.h" @@ -949,7 +950,7 @@ fhandler_base::readv (const struct iovec *const iov, const int iovcnt, char *p = buf; while (nbytes > 0) { - const int frag = min (nbytes, (ssize_t) iovptr->iov_len); + const int frag = MIN (nbytes, (ssize_t) iovptr->iov_len); memcpy (iovptr->iov_base, p, frag); p += frag; iovptr += 1; @@ -1001,7 +1002,7 @@ fhandler_base::writev (const struct iovec *const iov, const int iovcnt, while (nbytes != 0) { - const int frag = min (nbytes, (ssize_t) iovptr->iov_len); + const int frag = MIN (nbytes, (ssize_t) iovptr->iov_len); memcpy (bufptr, iovptr->iov_base, frag); bufptr += frag; iovptr += 1; |