From 6e5269b86770c0101395f90aaee038adbdcdfba4 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Thu, 10 Jun 1999 16:47:23 +0000 Subject: [PATCH] See ChangeLog entry 19990610-11:40 EDT David G. Holm --- harbour/ChangeLog | 8 ++++++++ harbour/tests/working/makerunr.dos | 18 ++++++++++++++++++ harbour/tests/working/runner.c | 13 ++++++------- harbour/tests/working/runrdos.bat | 4 ++++ 4 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 harbour/tests/working/makerunr.dos create mode 100644 harbour/tests/working/runrdos.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5233e8d529..906ca5b3eb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19990610-11:40 EDT David G. Holm + + tests/working/makerunr.dos + - New make file to build RUNNER.EXE using DJGPP + * tests/working/runner.c + - Added 'static' to several forward declarations + + tests/working/runrdos.bat + - New batch file to build RUNNER.EXE using DJGPP + 19990610-09:30 CET Patrick Mast (Changes made by Jose Lalin) * source/rtl/asort.prg Resloved bug (Changed line 28 ) diff --git a/harbour/tests/working/makerunr.dos b/harbour/tests/working/makerunr.dos new file mode 100644 index 0000000000..cf4c829648 --- /dev/null +++ b/harbour/tests/working/makerunr.dos @@ -0,0 +1,18 @@ +# $Id$ +# Makefile for DOS DJGPP +# Usage: +# make -r -f makerunr.dos +# where is the name of compiled file without extension +# +include ..\..\makedos.env + +TARGET=$(MAKECMDGOALS) + +$(TARGET): $(TARGET).exe + +$(TARGET).exe: $(TARGET).o + $(CC) $? -L$(HARBOURDIR)/libs -lharb -o $@ + +$(TARGET).o: $(TARGET).c + $(CC) $(CFLAGS) -c -o $@ $? + diff --git a/harbour/tests/working/runner.c b/harbour/tests/working/runner.c index 5ff5470ffe..54ef8f7d41 100644 --- a/harbour/tests/working/runner.c +++ b/harbour/tests/working/runner.c @@ -45,13 +45,13 @@ typedef struct #define SYM_NOT_FOUND 0xFFFFFFFF /* Symbol not found. FindSymbol */ -PASM_CALL CreateFun( PSYMBOL, PBYTE ); /* Create a dynamic function*/ +static PASM_CALL CreateFun( PSYMBOL, PBYTE ); /* Create a dynamic function*/ void Do( WORD ); -ULONG FindSymbol( char *, PDYNFUNC, ULONG ); +static ULONG FindSymbol( char *, PDYNFUNC, ULONG ); HARBOUR HB_RUN(); -void HRB_FileClose( FILE * ); -void HRB_FileRead ( char *, int, int, FILE * ); -FILE *HRB_FileOpen ( char * ); +static void HRB_FileClose( FILE * ); +static void HRB_FileRead ( char *, int, int, FILE * ); +static FILE *HRB_FileOpen ( char * ); void Push( PHB_ITEM ); void PushNil( void ); void PushSymbol( PSYMBOL ); @@ -116,7 +116,7 @@ HARBOUR HB_RUN( void ) { pSymRead[ ul ].szName = ReadId( file ); pSymRead[ ul ].cScope = ReadByte( file ); - pSymRead[ ul ].pFunPtr = (void *) ReadByte( file ); + pSymRead[ ul ].pFunPtr = ( HARBOURFUNC ) ReadByte( file ); pSymRead[ ul ].pDynSym = NULL; } @@ -259,7 +259,6 @@ static ULONG FindSymbol( char *szName, PDYNFUNC pDynFunc, ULONG ulLoaded ) Read the next (zero terminated) identifier */ char *ReadId( FILE *file ) { - char *szFileName; char *szTemp; /* Temporary buffer */ char *szIdx; char *szRet; diff --git a/harbour/tests/working/runrdos.bat b/harbour/tests/working/runrdos.bat new file mode 100644 index 0000000000..adb65f8280 --- /dev/null +++ b/harbour/tests/working/runrdos.bat @@ -0,0 +1,4 @@ +rem runner.c -> runner.exe using gcc (djgpp) + +make -r -fmakerunr.dos runner +