diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9a842de0d6..11689f2fa2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,8 @@ +19990918-13:07 GMT+1 Victor Szel + + * tests/working/rtl_test.prg + ! OS_NewLine() is only used when __HARBOUR__ is defined. + 19990918-01:55 EDT David G. Holm * config/win32/bcc32.cf ! My previous update only allowed Borland to compile, but not link. @@ -44,7 +49,7 @@ % These test programs now use OS_NewLine() instead of using 4 different methods. -19990917-04:58 GMT+1 Victor Szel +19990918-04:58 GMT+1 Victor Szel * source/vm/hvm.c + Added WORD typedef for HARBOUR_OBJ_GENERATION section. @@ -58,7 +63,7 @@ + hb_max_row() now returns 23 for UNIXes and 24 otherwise. % fputs(" "...) -> fputc(' '...) -19990917-03:22 GMT+1 Victor Szel +19990918-03:22 GMT+1 Victor Szel * source/rtl/memofile.c source/rtl/Makefile diff --git a/harbour/tests/working/rtl_test.prg b/harbour/tests/working/rtl_test.prg index 910eb46ab8..52c92c6327 100644 --- a/harbour/tests/working/rtl_test.prg +++ b/harbour/tests/working/rtl_test.prg @@ -1513,7 +1513,7 @@ STATIC FUNCTION Main_STRINGS() #ifdef __HARBOUR__ STATIC FUNCTION Long_STRINGS() - TEST_LINE( RIGHT( SPACE( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" ) + TEST_LINE( RIGHT( SPACE( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" ) TEST_LINE( LEN( SPACE( 81910 ) + "1234567890" ), 81920 ) TEST_LINE( ( "1234567890" + SPACE( 810910 ) ) - ( "1234567890" + SPACE( 810910 ) ), "12345678901234567890" + SPACE( 810910 * 2 ) ) @@ -2062,7 +2062,11 @@ STATIC FUNCTION TEST_BEGIN( cParam ) s_nStartTime := Seconds() +#ifdef __HARBOUR__ s_cNewLine := OS_NewLine() +#else + s_cNewLine := Chr( 13 ) + Chr( 10 ) +#endif s_lShowAll := "/ALL" $ Upper( cParam ) s_aSkipList := ListToNArray( CMDLGetValue( Upper( cParam ), "/SKIP:", "" ) )