diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2a46d3c915..856ae7e91f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-08-08 12:11 GMT+2 Maurilio Longo + * source/common/hbver.c + ! fixed a couple of new warning from last change ;-) + 2000-08-09 09:25 UTC+0100 Ryszard Glab *source/compiler/harbour.l @@ -26,13 +30,13 @@ *source/compiler/hbgenerr.c * added error: CASE or OTHERWISE does not match DO CASE" if CASE or OTHERWISE is used outside of DO CASE/ENDCASE - + *source/compiler/harbour.l * cleaned or fixed many rules * fixed support for [] string delimiters * fixed support for DO fun WITH (expr) * see changes in harbour.y - + *source/compiler/harbour.y *moved here rules for: | OPTIONAL @@ -52,7 +56,7 @@ fill yyval.string member) The generated code is much smaller and faster. -NOTE: +NOTE: Ron, this breaks harbour.slx rules !!! 2000-08-08 12:11 GMT+2 Maurilio Longo diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index ae7aef3bfb..f22a438cce 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -160,17 +160,19 @@ char * hb_verPlatform( void ) rc = DosQuerySysInfo( 1L, QSV_MAX, ( void * ) aulQSV, sizeof( ULONG ) * QSV_MAX ); - if( rc == 0 ) + if( rc == 0 ) { /* is this OS/2 2.x ? */ - if (aulQSV[ QSV_VERSION_MINOR -1 ] < 30) - sprintf( pszPlatform, "OS/2 %d.%02d", + if (aulQSV[ QSV_VERSION_MINOR -1 ] < 30) { + sprintf( pszPlatform, "OS/2 %ld.%02ld", aulQSV[ QSV_VERSION_MAJOR -1 ] / 10, aulQSV[ QSV_VERSION_MINOR -1 ] ); - else + } else { sprintf( pszPlatform, "OS/2 %2.2f", (float) aulQSV[ QSV_VERSION_MINOR -1 ] / 10); - else + } + } else { sprintf( pszPlatform, "OS/2" ); + } } #elif defined(HB_OS_WIN_32)