From 2e0b4cc091a4c396673b46836dc0c334aab76e46 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 23 Nov 2007 04:55:11 +0000 Subject: [PATCH] 2007-11-23 05:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/gtwvg/wvtcore.c ! casting * harbour/source/rtl/memofile.c * cleaned warning in *nixes --- harbour/ChangeLog | 7 +++++++ harbour/contrib/gtwvg/wvtcore.c | 4 ++-- harbour/source/rtl/memofile.c | 15 +++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d203329f23..0561f18c65 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-23 05:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/gtwvg/wvtcore.c + ! casting + + * harbour/source/rtl/memofile.c + * cleaned warning in *nixes + 2007-11-23 05:09 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtwvt/gtwvt.h * harbour/source/rtl/gtwvt/gtwvt.c diff --git a/harbour/contrib/gtwvg/wvtcore.c b/harbour/contrib/gtwvg/wvtcore.c index 46e588f036..c38b7b868d 100644 --- a/harbour/contrib/gtwvg/wvtcore.c +++ b/harbour/contrib/gtwvg/wvtcore.c @@ -885,7 +885,7 @@ HB_FUNC( WVT_DRAWLABEL ) SetBkColor( _s->hdc, ISNIL( 7 ) ? _s->background : ( COLORREF ) hb_parnl( 7 ) ); SetTextColor( _s->hdc, ISNIL( 6 ) ? _s->foreground : ( COLORREF ) hb_parnl( 6 ) ); SetTextAlign( _s->hdc, ( ISNIL( 4 ) ? TA_LEFT : hb_parni( 4 ) ) ); - hOldFont = SelectObject( _s->hdc, hFont ); + hOldFont = ( HFONT ) SelectObject( _s->hdc, hFont ); ExtTextOut( _s->hdc, xy.x, xy.y, 0, NULL, hb_parcx( 3 ), strlen( hb_parcx( 3 ) ), NULL ); @@ -896,7 +896,7 @@ HB_FUNC( WVT_DRAWLABEL ) SetBkColor( _s->hGuiDC, ISNIL( 7 ) ? _s->background : ( COLORREF ) hb_parnl( 7 ) ); SetTextColor( _s->hGuiDC, ISNIL( 6 ) ? _s->foreground : ( COLORREF ) hb_parnl( 6 ) ); SetTextAlign( _s->hGuiDC, ( ISNIL( 4 ) ? TA_LEFT : hb_parni( 4 ) ) ); - hOldFontGui = SelectObject( _s->hGuiDC, hFont ); + hOldFontGui = ( HFONT ) SelectObject( _s->hGuiDC, hFont ); ExtTextOut( _s->hGuiDC, xy.x, xy.y, 0, NULL, hb_parcx( 3 ), strlen( hb_parcx( 3 ) ), NULL ); diff --git a/harbour/source/rtl/memofile.c b/harbour/source/rtl/memofile.c index d1295f060a..c333e1c27f 100644 --- a/harbour/source/rtl/memofile.c +++ b/harbour/source/rtl/memofile.c @@ -125,16 +125,15 @@ static BOOL hb_memowrit( BOOL bWriteEOF ) /* NOTE: CA-Clipper will add the EOF even if the write failed. [vszakats] */ /* NOTE: CA-Clipper will not return .F. when the EOF could not be written. [vszakats] */ - #if ! defined(OS_UNIX_COMPATIBLE) +#if ! defined(OS_UNIX_COMPATIBLE) + if( bWriteEOF ) /* if true, then write EOF */ { - if( bWriteEOF ) /* if true, then write EOF */ - { - BYTE byEOF = HB_CHAR_EOF; - - hb_fsWrite( fhnd, &byEOF, sizeof( BYTE ) ); - } + BYTE byEOF = HB_CHAR_EOF; + hb_fsWrite( fhnd, &byEOF, sizeof( BYTE ) ); } - #endif +#else + HB_SYMBOL_UNUSED( bWriteEOF ); +#endif hb_fsClose( fhnd ); }