From 411cdf39fc2b961a970a0ae91b9059614251247e Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 28 Aug 2012 17:42:54 +0000 Subject: Loads of win32 compilation issues fixed. Most are fairly minor unsigned/signed mismatches because of socket handles, but there were also some order-of-definition issues that were fixed in the FD_SETSIZE definition code. Fixed a few things that just never worked on windows, like Bu::Thread::yield(). --- src/stable/myriadstream.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/stable/myriadstream.cpp') diff --git a/src/stable/myriadstream.cpp b/src/stable/myriadstream.cpp index cb81355..58d3936 100644 --- a/src/stable/myriadstream.cpp +++ b/src/stable/myriadstream.cpp @@ -84,8 +84,8 @@ Bu::size Bu::MyriadStream::read( void *pBuf, Bu::size nBytes ) pCurBlock = rMyriad.getBlock( iCurBlock ); } - int iAmnt = Bu::min( - Bu::min( + int iAmnt = Bu::buMin( + Bu::buMin( rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, iLeft ), @@ -165,8 +165,8 @@ Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes ) // happens when creating a new stream. if( iPos < pStream->iSize ) { - int iAmnt = Bu::min( - Bu::min( + int iAmnt = Bu::buMin( + Bu::buMin( rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, iLeft ), @@ -189,7 +189,7 @@ Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes ) } else { - int iAmnt = Bu::min( + int iAmnt = Bu::buMin( rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, iLeft ); -- cgit v1.2.3