diff --git a/harbour/ChangeLog b/harbour/ChangeLog index febc925bca..a1fe3f2014 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19990525-10:03 CET Antonio Linares + * tests/working/runner.c (shouldn't this file be located at source/runner?) + - some small changes to admit FILE() Harbour name. + * tests/working/run_exp.h (shouldn't this file be located at include directory ?) + - some small changes to admit FILE() Harbour name. + 19990525-09:13 CET Antonio Linares * makefile.b32 - project dependencies list order changed to properly build everything in one pass diff --git a/harbour/tests/working/run_exp.h b/harbour/tests/working/run_exp.h index e39a7a9ec7..b9347e64c2 100644 --- a/harbour/tests/working/run_exp.h +++ b/harbour/tests/working/run_exp.h @@ -49,7 +49,7 @@ HARBOUR FCLOSE(); HARBOUR FERASE(); HARBOUR FRENAME(); HARBOUR FSEEK(); -HARBOUR _FILE(); +HARBOUR FILE(); HARBOUR FREADSTR(); HARBOUR BIN2I(); HARBOUR BIN2L(); @@ -168,7 +168,7 @@ static SYMBOL symbols[] = { { "FERASE", FS_PUBLIC, FERASE , 0 }, { "FRENAME", FS_PUBLIC, FRENAME , 0 }, { "FSEEK", FS_PUBLIC, FSEEK , 0 }, -{ "_FILE", FS_PUBLIC, _FILE , 0 }, +{ "FILE", FS_PUBLIC, FILE , 0 }, { "FREADSTR", FS_PUBLIC, FREADSTR , 0 }, { "BIN2I", FS_PUBLIC, BIN2I , 0 }, { "BIN2L", FS_PUBLIC, BIN2L , 0 }, diff --git a/harbour/tests/working/runner.c b/harbour/tests/working/runner.c index 61beea8b19..fc383331c9 100644 --- a/harbour/tests/working/runner.c +++ b/harbour/tests/working/runner.c @@ -1,6 +1,7 @@ #include "pcode.h" -#include +#define FILE _FILE +#include /* #if INTEL32 */ static BYTE prgFunction[] = { 0x68, 0x00, 0x00, 0x00, 0x00, @@ -52,8 +53,10 @@ void Do( WORD ); ULONG FindSymbol( char *, PDYNFUNC, ULONG ); void SafeRead( char *, int, int, FILE * ); - +#undef FILE #include "run_exp.h" +#define FILE _FILE + /* * * This file contains the exportable functions available to the Harbour program diff --git a/harbour/tests/working/test_all.prg b/harbour/tests/working/test_all.prg index e4a7b7214d..07d1242a94 100644 --- a/harbour/tests/working/test_all.prg +++ b/harbour/tests/working/test_all.prg @@ -9,6 +9,7 @@ Function Main( cOption ) LOCAL aDir,f,o,cRead aDir:=Directory("*.PRG") + o=fCreate("Test_All.Bat") IF !Empty( cOption ) .and. Upper( cOption ) == "HRB" fWrite(o,"del test_all.out"+chr(13)+chr(10))