summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_serial.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-03-08 09:36:11 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-03-08 09:36:11 +0000
commit75543537a16a0911af61045a96926cdb81f51383 (patch)
tree34fa443cb5d7c48e058d17cb2605e10d3947b521 /winsup/cygwin/fhandler_serial.cc
parent106833e9b360c8f56e465e2e80141a13dc193635 (diff)
downloadcygnal-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_serial.cc')
-rw-r--r--winsup/cygwin/fhandler_serial.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index 8668808f8..677b6221f 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -11,6 +11,7 @@ details. */
#include "winsup.h"
#include <unistd.h>
+#include <sys/param.h>
#include "cygerrno.h"
#include "security.h"
#include "path.h"
@@ -44,7 +45,7 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
int tot;
DWORD n;
- size_t minchars = vmin_ ? min (vmin_, ulen) : ulen;
+ size_t minchars = vmin_ ? MIN (vmin_, ulen) : ulen;
debug_printf ("ulen %d, vmin_ %d, vtime_ %d, hEvent %p", ulen, vmin_, vtime_,
io_status.hEvent);