From 75543537a16a0911af61045a96926cdb81f51383 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 8 Mar 2012 09:36:11 +0000 Subject: * Throughout, replace usage of w32api's min with MIN from sys/param.h. --- winsup/cygwin/fhandler_console.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/fhandler_console.cc') diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index a30b717d2..32454511a 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -18,6 +18,7 @@ details. */ #include #include #include +#include #include #include #include "cygerrno.h" @@ -1740,7 +1741,7 @@ fhandler_console::write_normal (const unsigned char *src, if (trunc_buf.len) { const unsigned char *nfound; - int cp_len = min (end - src, 4 - trunc_buf.len); + int cp_len = MIN (end - src, 4 - trunc_buf.len); memcpy (trunc_buf.buf + trunc_buf.len, src, cp_len); memset (&ps, 0, sizeof ps); switch (ret = f_mbtowc (_REENT, NULL, (const char *) trunc_buf.buf, -- cgit v1.2.3