From 1702b18a711c213686d6d757ffc0b6d30191502b Mon Sep 17 00:00:00 2001 From: micio Date: Wed, 1 Feb 2017 15:56:34 +0000 Subject: [PATCH] Bazaar/Serial : fix for OSX git-svn-id: svn://ultimatepp.org/upp/trunk@10814 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/Serial/SerialOSX.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazaar/Serial/SerialOSX.cpp b/bazaar/Serial/SerialOSX.cpp index 28384c955..85752c31e 100644 --- a/bazaar/Serial/SerialOSX.cpp +++ b/bazaar/Serial/SerialOSX.cpp @@ -415,7 +415,7 @@ namespace Upp uint32_t tim = msecs() + timeout; if (reqSize) { - n = min(reqSize, (size_t)1000); + n = min(reqSize, (uint32_t)1000); while (reqSize) { n = read(fd, buf, n); @@ -423,7 +423,7 @@ namespace Upp { if ((uint32_t)msecs() > tim) break; - n = min(reqSize, (size_t)1000); + n = min(reqSize, (uint32_t)1000); continue; } tim = msecs() + timeout; @@ -432,7 +432,7 @@ namespace Upp reqSize -= n; data.Cat(buf, n); } - n = min(reqSize, (size_t)1000); + n = min(reqSize, (uint32_t)1000); } } else