diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 04a0c47fb0..56e0cea93d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19990616-11:30 CET Eddie Runia + * source/rtl/console.c + Eject should be __Eject of course + * tests/working/dosshell.prg + With preprocessed statements + 19990616-13:12 Alexander Kresin updated: * source\compiler\harbour.y diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 44fc0dfca0..6fd78917e8 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -36,9 +36,9 @@ HARBOUR HB_QQOUT( void ); static SYMBOL symbols[] = { { "__ACCEPT", FS_PUBLIC, HB___ACCEPT, 0 }, +{ "__EJECT" , FS_PUBLIC, HB___EJECT , 0 }, { "DEVOUT" , FS_PUBLIC, HB_DEVOUT , 0 }, { "DEVPOS" , FS_PUBLIC, HB_DEVPOS , 0 }, -{ "EJECT" , FS_PUBLIC, HB___EJECT , 0 }, { "MAXCOL" , FS_PUBLIC, HB_MAXCOL , 0 }, { "MAXROW" , FS_PUBLIC, HB_MAXROW , 0 }, { "OUTERR" , FS_PUBLIC, HB_OUTERR , 0 }, diff --git a/harbour/tests/working/dosshell.prg b/harbour/tests/working/dosshell.prg index 50f8d8fb8f..7d8a0930fd 100644 --- a/harbour/tests/working/dosshell.prg +++ b/harbour/tests/working/dosshell.prg @@ -6,15 +6,18 @@ // // Warning : DOS only // +#command ? [] => QOut( ) +#command ! => __Run( ) + function Main() local cOs := Upper( OS() ) - if at( "WINDOWS", cOs ) != 0 .or. at( "DOS", cOs ) != 0 - QOut( "About to shell to DOS.." ) - __Run( GetEnv("COMSPEC") ) - QOut( "Hey, I am back !" ) + if (at( "WINDOWS", cOs ) != 0) .or. at( "DOS", cOs ) != 0 + ? "About to shell to DOS.." + ! GetEnv("COMSPEC") + ? "Hey, I am back !" else - QOut( "Sorry this program is for Windows and DOS only" ) + ? "Sorry this program is for Windows and DOS only" endif return nil