Resolved most errors under vc100 compiler

2011-05-14 22:30:30 -05:00
parent fb14aff1f6
commit 3926d2d30a
15 changed files with 46 additions and 33 deletions
--- a/indra/llplugin/llpluginmessagepipe.cpp
+++ b/indra/llplugin/llpluginmessagepipe.cpp
@@ -226,11 +226,11 @@ bool LLPluginMessagePipe::pumpOutput(bool flush)
 				else if (size == 0)
 				{
 					// Nothing at all was written. Increment wait time.
-					timeout_usec = std::min(flush_max_timeout, 2 * timeout_usec);
+					timeout_usec = llmin(flush_max_timeout, 2 * timeout_usec);
 				}
 				else
 				{
-					timeout_usec = std::max(flush_min_timeout, timeout_usec / 2);
+					timeout_usec = llmax(flush_min_timeout, timeout_usec / 2);
 				}
 			}
 			else if(APR_STATUS_IS_EOF(status))