From 8da0bb3c90b772542a2cdec67df821c922602ca8 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sat, 17 Oct 2009 19:11:05 +0000 Subject: [PATCH] 2009-10-17 21:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbmemio/memio.c * casting for 64bit builds --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbmemio/memio.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 33ff1f1ed3..f21c50b1cd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-17 21:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbmemio/memio.c + * casting for 64bit builds + 2009-10-17 01:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/Makefile + harbour/src/rtl/hbbffnc.c diff --git a/harbour/contrib/hbmemio/memio.c b/harbour/contrib/hbmemio/memio.c index bb129ba2e0..5f5147865a 100644 --- a/harbour/contrib/hbmemio/memio.c +++ b/harbour/contrib/hbmemio/memio.c @@ -507,14 +507,14 @@ HB_MEMFS_EXPORT ULONG hb_memfsReadAt( HB_FHANDLE hFile, void * pBuff, ULONG ulCo return 0; HB_MEMFSMT_LOCK - if( pInode->llSize >= llOffset + ulCount ) + if( pInode->llSize >= llOffset + ( HB_FOFFSET ) ulCount ) ulRead = ulCount; else ulRead = ( ULONG ) ( pInode->llSize - llOffset ); memcpy( pBuff, pInode->pData + ( ULONG ) llOffset, ulRead ); HB_MEMFSMT_UNLOCK - pFile->llPos = llOffset + ulCount; + pFile->llPos = llOffset + ( HB_FOFFSET ) ulCount; return ulRead; } @@ -537,12 +537,12 @@ HB_MEMFS_EXPORT ULONG hb_memfsWriteAt( HB_FHANDLE hFile, const void * pBuff, ULO HB_MEMFSMT_LOCK /* Reallocate if neccesary */ - if( pInode->llAlloc < llOffset + ulCount ) + if( pInode->llAlloc < llOffset + ( HB_FOFFSET ) ulCount ) { HB_FOFFSET llNewAlloc = pInode->llAlloc + ( pInode->llAlloc >> 1 ); - if( llNewAlloc < llOffset + ulCount ) - llNewAlloc = llOffset + ulCount; + if( llNewAlloc < llOffset + ( HB_FOFFSET ) ulCount ) + llNewAlloc = llOffset + ( HB_FOFFSET ) ulCount; pInode->pData = ( char * ) hb_xrealloc( pInode->pData, ( ULONG ) llNewAlloc ); memset( pInode->pData + ( ULONG ) pInode->llAlloc, 0, llNewAlloc - pInode->llAlloc ); @@ -550,11 +550,11 @@ HB_MEMFS_EXPORT ULONG hb_memfsWriteAt( HB_FHANDLE hFile, const void * pBuff, ULO } memcpy( pInode->pData + ( ULONG ) llOffset, pBuff, ulCount ); - if( pInode->llSize < llOffset + ulCount ) - pInode->llSize = llOffset + ulCount; + if( pInode->llSize < llOffset + ( HB_FOFFSET ) ulCount ) + pInode->llSize = llOffset + ( HB_FOFFSET ) ulCount; HB_MEMFSMT_UNLOCK - pFile->llPos = llOffset + ulCount; + pFile->llPos = llOffset + ( HB_FOFFSET ) ulCount; return ulCount; }