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/experimental/cipher.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/experimental/cipher.h') diff --git a/src/experimental/cipher.h b/src/experimental/cipher.h index 74f5124..5d5cb07 100644 --- a/src/experimental/cipher.h +++ b/src/experimental/cipher.h @@ -61,7 +61,7 @@ namespace Bu if( iReadBufFill == iBlockSize ) { - int iCpy = Bu::min( (int)(iBytes-iRead), iBlockSize-iReadBufPos ); + int iCpy = Bu::buMin( (int)(iBytes-iRead), iBlockSize-iReadBufPos ); memcpy( ((char *)pBuf)+iRead, aReadBuf+iReadBufPos, iCpy ); iRead += iCpy; iReadBufPos += iCpy; @@ -81,7 +81,7 @@ namespace Bu while( iPos < iBytes ) { - int iLeft = Bu::min((int)(iBytes-iPos),iBlockSize-iWriteBufFill); + int iLeft = Bu::buMin((int)(iBytes-iPos),iBlockSize-iWriteBufFill); memcpy( aWriteBuf+iWriteBufFill, (char *)pBuf+iPos, iLeft ); iPos += iLeft; iWriteBufFill += iLeft; -- cgit v1.2.3