From 332b8b445c9e748ab465b3d3f06f35ac582e26c2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 23 Feb 2006 01:17:57 +0000 Subject: [PATCH] 2006-02-22 15:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/compiler/harbour.c * harbour/source/rtl/gtdos/gtdos.c * fixed casting and typos for DOS OpenWatcom compilation --- harbour/ChangeLog | 5 +++++ harbour/source/compiler/harbour.c | 2 +- harbour/source/rtl/gtdos/gtdos.c | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dab678bed6..97961bbb39 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ * fixed <-x-> match marker + * added fixed length of command/translate/define name to + speed translation + + * source/compiler/harbour.l + * fixed GPF in handling of '¯o.tekst' syntax (introduced recently) diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c index 0981557387..a28b917b40 100644 --- a/harbour/source/compiler/harbour.c +++ b/harbour/source/compiler/harbour.c @@ -5047,7 +5047,7 @@ static void hb_compCompileEnd( void ) { hb_compParserStop(); /* uses hb_comp_files.pLast */ } - hb_comp_files.pLast = pFile->pPrev; + hb_comp_files.pLast = ( PFILE ) pFile->pPrev; hb_xfree( pFile ); } hb_comp_files.pLast = NULL; diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c index d9c03a65f5..3aa5d3da4b 100644 --- a/harbour/source/rtl/gtdos/gtdos.c +++ b/harbour/source/rtl/gtdos/gtdos.c @@ -167,7 +167,7 @@ static int kbhit( void ) #if !defined(__DJGPP__) && !defined(__RSX32__) #if defined(__WATCOMC__) || defined(_MSC_VER) -static void hb_gt_CtrlBreak_Handler( int iSignal ) +static void hb_gt_dos_CtrlBreak_Handler( int iSignal ) { /* Ctrl-Break was pressed */ /* NOTE: the layout of this function is forced by the compiler @@ -1189,7 +1189,7 @@ static void vmode50x80( void ) * FFh unknown display type ****************************************************************************/ -static USHORT hb_gt_GetDisplay( void ) +static USHORT hb_gt_dos_GetDisplay( void ) { union REGS regs; @@ -1206,7 +1206,7 @@ static BOOL hb_gt_dos_SetMode( int iRows, int iCols ) HB_TRACE( HB_TR_DEBUG, ("hb_gt_dos_SetMode(%d, %d)", iRows, iCols) ); - bIsVGA = ( hb_gt_GetDisplay() == 8 ); + bIsVGA = ( hb_gt_dos_GetDisplay() == 8 ); bIsVesa = FALSE; /* Available modes in B&N and color screens */ @@ -1241,7 +1241,7 @@ static BOOL hb_gt_dos_SetMode( int iRows, int iCols ) if( iCols > 80 && bIsVesa ) { /* In development process - * return( hb_gt_Modevesa( nMode) ); + * return( hb_gt_dos_Modevesa( nMode) ); */ } }