From 75543537a16a0911af61045a96926cdb81f51383 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
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_tty.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'winsup/cygwin/fhandler_tty.cc')

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 547cf72b8..6189046b9 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -11,6 +11,7 @@ details. */
 
 #include "winsup.h"
 #include <stdlib.h>
+#include <sys/param.h>
 #include <cygwin/kd.h>
 #include "cygerrno.h"
 #include "security.h"
@@ -623,7 +624,7 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
 
   while (len)
     {
-      n = min (OUT_BUFFER_SIZE, len);
+      n = MIN (OUT_BUFFER_SIZE, len);
       char *buf = (char *)ptr;
       ptr = (char *) ptr + n;
       len -= n;
@@ -802,7 +803,7 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
 	  return;
 	}
 
-      readlen = min (bytes_in_pipe, min (len, sizeof (buf)));
+      readlen = MIN (bytes_in_pipe, MIN (len, sizeof (buf)));
 
       if (ptr && vmin && readlen > (unsigned) vmin)
 	readlen = vmin;
-- 
cgit v1.2.3