From bb603a067b4e5672b5cb96e5f6979105017786d2 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Tue, 21 Sep 1999 18:37:58 +0000 Subject: [PATCH] See ChangeLog entry 19990921-14:25 EDT David G. Holm --- harbour/ChangeLog | 13 +++++++++++++ harbour/source/rtl/set.c | 4 ++-- harbour/source/rtl/strings.c | 2 +- harbour/source/rtl/tone.c | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 60e73fa049..f0b575b5f1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +19990921-14:25 EDT David G. Holm + + * source/rtl/set.c + ! Changed unitialized bflag in call to open_handle() to FALSE + + * source/rtl/strings.c + ! Rearranged the logic in hb_itemStr() that determines whether or + not to round a floating point number being converted to a string + + * source/rtl/tone.c + ! Added ' || defined(WINNT)' to the ULONG #if for calculating the + value of 'temp' + 19990921-12:25 EDT David G. Holm * source/rtl/console.c diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index d30e471b01..3a661b9083 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -780,11 +780,11 @@ HARBOUR HB_SET( void ) else hb_retc( "" ); if( args > 1 ) { - /* If the print file is not already open, open it. */ + /* If the print file is not already open, open it in overwrite mode. */ hb_set.HB_SET_DEVICE = set_string( pArg2, hb_set.HB_SET_DEVICE ); if( hb_stricmp( hb_set.HB_SET_DEVICE, "PRINTER" ) == 0 && hb_set_printhan == FS_ERROR && hb_set.HB_SET_PRINTFILE && strlen( hb_set.HB_SET_PRINTFILE ) > 0 ) - hb_set_printhan = open_handle( hb_set.HB_SET_PRINTFILE, bFlag, ".prn", HB_SET_PRINTFILE ); + hb_set_printhan = open_handle( hb_set.HB_SET_PRINTFILE, FALSE, ".prn", HB_SET_PRINTFILE ); } break; case HB_SET_EPOCH : diff --git a/harbour/source/rtl/strings.c b/harbour/source/rtl/strings.c index 4d1dd130cd..8b87667322 100644 --- a/harbour/source/rtl/strings.c +++ b/harbour/source/rtl/strings.c @@ -1279,7 +1279,7 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ) else #endif { - if( iDec < IS_DOUBLE( pNumber ) ? pNumber->item.asDouble.decimal : 0 ) + if( IS_DOUBLE( pNumber ) && iDec < pNumber->item.asDouble.decimal ) dNumber = hb_numRound( dNumber, iDec ); if( iDec == 0 ) diff --git a/harbour/source/rtl/tone.c b/harbour/source/rtl/tone.c index f0847fbe5d..e3b12c3154 100644 --- a/harbour/source/rtl/tone.c +++ b/harbour/source/rtl/tone.c @@ -168,7 +168,7 @@ void hb_tone( double dFrequency, double dDuration ) #endif while( dDuration > 0.0 ) { -#if defined(HARBOUR_GCC_OS2) || defined(_Windows) || defined(__CYGWIN__) +#if defined(HARBOUR_GCC_OS2) || defined(_Windows) || defined(__CYGWIN__) || defined(WINNT) temp = MIN( MAX( 0, dDuration ), ULONG_MAX ); #elif defined(OS2) || defined(__BORLANDC__) || defined(__DJGPP__) || defined(__MINGW32__) temp = MIN( MAX( 0, dDuration ), USHRT_MAX );