diff options
author | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
commit | 411cdf39fc2b961a970a0ae91b9059614251247e (patch) | |
tree | 935afa56c11aef0fb769e63659970e7d033a99e8 /src/stable/myriadstream.cpp | |
parent | fc5132d68ae9e6afdbd0b5a687ba81c88fc84826 (diff) | |
download | libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.gz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.bz2 libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.xz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.zip |
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().
Diffstat (limited to 'src/stable/myriadstream.cpp')
-rw-r--r-- | src/stable/myriadstream.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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 ) | |||
84 | pCurBlock = rMyriad.getBlock( iCurBlock ); | 84 | pCurBlock = rMyriad.getBlock( iCurBlock ); |
85 | } | 85 | } |
86 | 86 | ||
87 | int iAmnt = Bu::min( | 87 | int iAmnt = Bu::buMin( |
88 | Bu::min( | 88 | Bu::buMin( |
89 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, | 89 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, |
90 | iLeft | 90 | iLeft |
91 | ), | 91 | ), |
@@ -165,8 +165,8 @@ Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes ) | |||
165 | // happens when creating a new stream. | 165 | // happens when creating a new stream. |
166 | if( iPos < pStream->iSize ) | 166 | if( iPos < pStream->iSize ) |
167 | { | 167 | { |
168 | int iAmnt = Bu::min( | 168 | int iAmnt = Bu::buMin( |
169 | Bu::min( | 169 | Bu::buMin( |
170 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, | 170 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, |
171 | iLeft | 171 | iLeft |
172 | ), | 172 | ), |
@@ -189,7 +189,7 @@ Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes ) | |||
189 | } | 189 | } |
190 | else | 190 | else |
191 | { | 191 | { |
192 | int iAmnt = Bu::min( | 192 | int iAmnt = Bu::buMin( |
193 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, | 193 | rMyriad.iBlockSize - iPos%rMyriad.iBlockSize, |
194 | iLeft | 194 | iLeft |
195 | ); | 195 | ); |