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/unstable/myriadfs.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/unstable/myriadfs.cpp') diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp index 32e1ad6..6ed176d 100644 --- a/src/unstable/myriadfs.cpp +++ b/src/unstable/myriadfs.cpp @@ -5,6 +5,7 @@ * terms of the license contained in the file LICENSE. */ +#include "bu/config.h" #include "bu/myriadfs.h" #include "bu/myriadstream.h" @@ -434,7 +435,7 @@ int32_t Bu::MyriadFs::lookupInode( Bu::String::const_iterator iStart, void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs ) { rIs.setPos( hNodeIndex.get( iNode )*sizeof(RawStat) ); - if( rIs.read( &rs, sizeof(RawStat) ) < sizeof(RawStat) ) + if( rIs.read( &rs, sizeof(RawStat) ) < (int)sizeof(RawStat) ) throw Bu::MyriadFsException("Filesystem corruption detected."); if( rs.iNode != iNode ) throw Bu::MyriadFsException("Filesystem corruption detected."); @@ -451,7 +452,7 @@ void Bu::MyriadFs::writeInode( const RawStat &rs, { rOs.setSize( hNodeIndex.getSize()*sizeof(RawStat) ); rOs.setPos( hNodeIndex.get( rs.iNode )*sizeof(RawStat) ); - if( rOs.write( &rs, sizeof(RawStat) ) < sizeof(RawStat) ) + if( rOs.write( &rs, sizeof(RawStat) ) < (int)sizeof(RawStat) ) throw Bu::MyriadFsException("Error writing inode to header stream."); } -- cgit v1.2.3