From 08be73b95cdc86345f91a747ea4cdf6a6fe97e7d Mon Sep 17 00:00:00 2001 From: Miguel Angel Marchuet Frutos Date: Tue, 21 Oct 2008 11:16:35 +0000 Subject: [PATCH] 2008-10-21 13:17 UTC+0100 Miguel Angel Marchuet * contrib/xhb/hbcompat.ch * contrib/xhb/hbcompat.h + added compatibilities. * include/fileio.ch * source/rtl/filesys.c * minor sintax correction. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/xhb/hbcompat.ch | 4 ++++ harbour/contrib/xhb/hbcompat.h | 1 + harbour/include/fileio.ch | 2 +- harbour/source/rtl/filesys.c | 3 ++- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da7c1f11ed..07056dbd8b 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-21 13:17 UTC+0100 Miguel Angel Marchuet + * contrib/xhb/hbcompat.ch + * contrib/xhb/hbcompat.h + + added compatibilities. + * include/fileio.ch + * source/rtl/filesys.c + * minor sintax correction. + 2008-10-21 09:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/console.c ! Fixed typo in hb_dispoutAt() numeric color handling. diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 43947a545d..e308f1119c 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -115,6 +115,8 @@ #xtranslate hb_IniRead([]) => hb_ReadIni() #xtranslate hb_IniWrite([]) => hb_WriteIni() + #xtranslate hb_DisableWaitLocks([]) => DisableWaitLocks() + /* Some statement endings */ #xcommand ENDSEQUENCE => END #xcommand ENDSWITCH => END @@ -192,6 +194,8 @@ #xtranslate hb_ReadIni([]) => hb_IniRead() #xtranslate hb_WriteIni([]) => hb_IniWrite() + #xtranslate DisableWaitLocks([]) => hb_DisableWaitLocks() + #xtranslate Str(,[],[],)=> iif(, hb_NToS(), Str()) #xtranslate hb_CMDARGARGV([])=> hb_ARGV(0) diff --git a/harbour/contrib/xhb/hbcompat.h b/harbour/contrib/xhb/hbcompat.h index f10a1b0afc..e0c2530e51 100644 --- a/harbour/contrib/xhb/hbcompat.h +++ b/harbour/contrib/xhb/hbcompat.h @@ -70,6 +70,7 @@ #define hb_retcAdopt( szText ) hb_retc_buffer( (szText) ) #define hb_retclenAdopt( szText, ulLen ) hb_retclen_buffer( (szText), (ulLen) ) + #define hb_retclenAdoptRaw( szText, ulLen ) hb_retclen_buffer( (szText), (ulLen) ) #define hb_retcStatic( szText ) hb_retc_const( (szText) ) #define hb_storclenAdopt hb_storclen_buffer #define hb_itemPutCRawStatic hb_itemPutCLConst diff --git a/harbour/include/fileio.ch b/harbour/include/fileio.ch index eeda78884b..c93f550254 100644 --- a/harbour/include/fileio.ch +++ b/harbour/include/fileio.ch @@ -81,7 +81,7 @@ /* File seek mode flags */ #define FS_SET 0 /* Seek from beginning of file */ -#define FS_RELATIVE 1 /* Seek from current file poitner */ +#define FS_RELATIVE 1 /* Seek from current file pointer */ #define FS_END 2 /* Seek from end of file */ /* File mode flags */ diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index fa25b42d64..b83343bd87 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -317,7 +317,7 @@ static HANDLE DosToWinHandle( HB_FHANDLE fHandle ) return GetStdHandle( STD_OUTPUT_HANDLE ); else if( fHandle == ( HB_FHANDLE ) 2 ) - return GetStdHandle( STD_ERROR_HANDLE); + return GetStdHandle( STD_ERROR_HANDLE ); else return ( HANDLE ) fHandle; @@ -3214,3 +3214,4 @@ HB_FUNC( HB_DISABLEWAITLOCKS ) { hb_retl( hb_fsDisableWaitLocks( ISLOG( 1 ) ? ( hb_parl( 1 ) ? 1 : 0 ) : -1 ) ); } +