diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b4df86de0d..0a67b2d4cd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-19 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/filebuf.c + * source/rtl/filesys.c + ! Fixed -W4 warnings. + + * source/rtl/tclass.prg + * source/rtl/tsymbol.prg + ! Fixed mistakes in recent commit. + 2008-10-19 09:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * contrib/mtpl_b32.mak diff --git a/harbour/source/rtl/filebuf.c b/harbour/source/rtl/filebuf.c index b8822baa37..3af20528a4 100644 --- a/harbour/source/rtl/filebuf.c +++ b/harbour/source/rtl/filebuf.c @@ -432,7 +432,7 @@ BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen, fResult = hb_fileUnlock( pFile, &fLockFS, ulStart, ulLen ); hb_threadLeaveCriticalSection( &s_fileMtx ); if( fLockFS ) - hb_fsLockLarge( pFile->hFile, ulStart, ulLen, iType ); + hb_fsLockLarge( pFile->hFile, ulStart, ulLen, ( USHORT ) iType ); } else { @@ -441,7 +441,7 @@ BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen, hb_threadLeaveCriticalSection( &s_fileMtx ); if( fLockFS ) { - fResult = hb_fsLockLarge( pFile->hFile, ulStart, ulLen, iType ); + fResult = hb_fsLockLarge( pFile->hFile, ulStart, ulLen, ( USHORT ) iType ); if( !fResult ) { hb_threadEnterCriticalSection( &s_fileMtx ); diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 1f35824c35..fa25b42d64 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -3097,7 +3097,7 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) } fTrim = hb_setGetTrimFileName(); - cDirSep = hb_setGetDirSeparator(); + cDirSep = ( char ) hb_setGetDirSeparator(); iFileCase = hb_setGetFileCase(); iDirCase = hb_setGetDirCase(); diff --git a/harbour/source/rtl/tclass.prg b/harbour/source/rtl/tclass.prg index 7151870dc2..48ddfe1dd5 100644 --- a/harbour/source/rtl/tclass.prg +++ b/harbour/source/rtl/tclass.prg @@ -175,7 +175,7 @@ STATIC FUNCTION New( cClassName, xSuper, sClassFunc, lModuleFriendly ) IF Empty( xSuper ) ::asSuper := {} ELSEIF ISCHARACTER( xSuper ) - ::asSuper := { __DynsNToSym( xSuper ) } + ::asSuper := { __DynsN2Sym( xSuper ) } ELSEIF hb_isSymbol( xSuper ) ::asSuper := { xSuper } ELSEIF ISARRAY( xSuper ) @@ -184,7 +184,7 @@ STATIC FUNCTION New( cClassName, xSuper, sClassFunc, lModuleFriendly ) FOR i := 1 TO nSuper IF !Empty( xSuper[ i ] ) IF ISCHARACTER( xSuper[ i ] ) - AAdd( ::asSuper, __DynsNToSym( xSuper[ i ] ) ) + AAdd( ::asSuper, __DynsN2Sym( xSuper[ i ] ) ) ELSEIF hb_isSymbol( xSuper[ i ] ) AAdd( ::asSuper, xSuper[ i ] ) ENDIF diff --git a/harbour/source/rtl/tsymbol.prg b/harbour/source/rtl/tsymbol.prg index cf157bc45f..f0bdd72fda 100644 --- a/harbour/source/rtl/tsymbol.prg +++ b/harbour/source/rtl/tsymbol.prg @@ -68,7 +68,7 @@ CREATE CLASS Symbol ENDCLASS METHOD New( cSymName ) CLASS Symbol - ::nSym := __DynSNToSym( cSymName ) + ::nSym := __DynSN2Sym( cSymName ) RETURN Self METHOD name() CLASS Symbol