diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bc5f37cb31..5e538b182c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +20000315-14:28 GMT+1 Victor Szakats + * include/hbvmpub.h + include/hbcomp.h + include/hbmacro.h + source/compiler/genc.c + % From now on hbpcode.h is not included in every file, to save compile + time. !! WARNING !! All .PRG must be rebuilt. + * source/* + % Removed some superfluous #include "" directives, to save compile time. + The whole inclusion system checked. + * tests/test.frm + ! Re-uploaded in binary mode. + 20000315-08:08 GMT+1 Victor Szakats * source/rtl/filesys.c source/rtl/console.c diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 35f04cfbf1..d74ec2b129 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -47,6 +47,7 @@ #include "hbpp.h" #include "hbver.h" #include "hbexprop.h" +#include "hbpcode.h" /* compiler related declarations */ diff --git a/harbour/include/hbmacro.h b/harbour/include/hbmacro.h index 2b9bbbbfe3..3501b9fbeb 100644 --- a/harbour/include/hbmacro.h +++ b/harbour/include/hbmacro.h @@ -53,6 +53,7 @@ #include "hbapierr.h" #include "hbvm.h" #include "hbexprop.h" +#include "hbpcode.h" /* flags for compilation process */ diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h index 36ef08a619..a6b2c5a15f 100644 --- a/harbour/include/hbvmpub.h +++ b/harbour/include/hbvmpub.h @@ -37,7 +37,6 @@ #define HB_VMPUB_H_ #include "hbdefs.h" -#include "hbpcode.h" struct _HB_DYNS; diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 315199dd8b..174f76c053 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -53,11 +53,10 @@ HBDOC_DIR = utils\hbdoc # C compiler definition and C flags. These should never have to change. # -CFLAGS = $(CFLAGS) -d -I$(INCLUDE_DIR) -CLIBFLAGS = $(CFLAGS) -c +CFLAGS = $(CFLAGS) -d -I$(INCLUDE_DIR) +CLIBFLAGS = $(CFLAGS) -c CLIBFLAGSDEBUG = $(CLIBFLAGS) -v - -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 # # Macros to access our library names diff --git a/harbour/source/compiler/genc.c b/harbour/source/compiler/genc.c index 2feee72f8b..7129fd50e2 100644 --- a/harbour/source/compiler/genc.c +++ b/harbour/source/compiler/genc.c @@ -70,6 +70,7 @@ void hb_compGenCCode( PHB_FNAME pFileName ) /* generates the C language ou fprintf( yyc, " * Generated C source code\n */\n\n" ); fprintf( yyc, "#include \"hbvmpub.h\"\n" ); + fprintf( yyc, "#include \"hbpcode.h\"\n" ); fprintf( yyc, "#include \"hbinit.h\"\n\n\n" ); if( ! hb_comp_bStartProc ) diff --git a/harbour/source/compiler/genjava.c b/harbour/source/compiler/genjava.c index bd78f460a0..02921acace 100644 --- a/harbour/source/compiler/genjava.c +++ b/harbour/source/compiler/genjava.c @@ -34,11 +34,7 @@ * */ -#include "hbapi.h" #include "hbcomp.h" -#include "hbpcode.h" -#include "hberrors.h" -#include "hbver.h" #define SYM_NOLINK 0 /* Symbol does not have to be linked */ #define SYM_FUNC 1 /* Defined function */ diff --git a/harbour/source/compiler/genobj32.c b/harbour/source/compiler/genobj32.c index fb76e9bb1a..1b54fd9106 100644 --- a/harbour/source/compiler/genobj32.c +++ b/harbour/source/compiler/genobj32.c @@ -33,10 +33,7 @@ * */ -#include "hbapi.h" #include "hbcomp.h" -#include "hbpcode.h" -#include "hberrors.h" #ifndef HARBOUR_OBJ_GENERATION diff --git a/harbour/source/compiler/genpas.c b/harbour/source/compiler/genpas.c index ae88165f31..26439b0c18 100644 --- a/harbour/source/compiler/genpas.c +++ b/harbour/source/compiler/genpas.c @@ -33,10 +33,7 @@ * */ -#include "hbapi.h" #include "hbcomp.h" -#include "hbpcode.h" -#include "hberrors.h" void hb_compGenPascal( PHB_FNAME pFileName ) { diff --git a/harbour/source/compiler/genrc.c b/harbour/source/compiler/genrc.c index 9af3657131..fdb2760328 100644 --- a/harbour/source/compiler/genrc.c +++ b/harbour/source/compiler/genrc.c @@ -33,10 +33,7 @@ * */ -#include "hbapi.h" #include "hbcomp.h" -#include "hbpcode.h" -#include "hberrors.h" void hb_compGenRC( PHB_FNAME pFileName ) { diff --git a/harbour/source/pp/ppcomp.c b/harbour/source/pp/ppcomp.c index b3fe330533..fe3b83d167 100644 --- a/harbour/source/pp/ppcomp.c +++ b/harbour/source/pp/ppcomp.c @@ -45,8 +45,8 @@ #include #include #include + #include "hbpp.h" -#include "hberrors.h" #include "hbcomp.h" extern FILES hb_comp_files; diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 93b97f6633..b2929a8143 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -64,7 +64,6 @@ #include #include "hbpp.h" -#include "hberrors.h" #include "hbcomp.h" #if defined( OS_UNIX_COMPATIBLE ) diff --git a/harbour/source/pp/pplib.c b/harbour/source/pp/pplib.c index 57af64080e..f8a66caac3 100644 --- a/harbour/source/pp/pplib.c +++ b/harbour/source/pp/pplib.c @@ -48,9 +48,7 @@ #include "hbpp.h" #include "hbcomp.h" #include "hbapi.h" -#include "hbapiitm.h" #include "hbapierr.h" -#include "hberrors.h" PATHNAMES * hb_comp_pIncludePath = NULL; PHB_FNAME hb_comp_pFileName = NULL; diff --git a/harbour/source/pp/pptable.c b/harbour/source/pp/pptable.c index 78242d7377..351baf46c7 100644 --- a/harbour/source/pp/pptable.c +++ b/harbour/source/pp/pptable.c @@ -43,6 +43,7 @@ #endif #include + #include "hbpp.h" static DEFINES sD___01 = {"_SET_ALTERNATE",NULL,-1,"18", NULL }; diff --git a/harbour/source/pp/stdalone/hbpp.c b/harbour/source/pp/stdalone/hbpp.c index 0f6a0f7ccd..7290809af7 100644 --- a/harbour/source/pp/stdalone/hbpp.c +++ b/harbour/source/pp/stdalone/hbpp.c @@ -49,8 +49,6 @@ #include /* required for allocating and freeing memory */ #include "hbpp.h" -#include "hberrors.h" -#include "hbver.h" #include "hbcomp.h" static int hb_pp_Parse( FILE * handl_o ); diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index 1d58c7d276..d9a98d663a 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -57,10 +57,10 @@ */ #include "hbapi.h" -#include "hbvm.h" #include "hbapiitm.h" #include "hbapierr.h" #include "hbapilng.h" +#include "hbvm.h" /* This is added to be able to detect a recursive error, and not let Harbour go into an infinite loop, this is an emulated version of the Clipper diff --git a/harbour/source/rtl/gtapi.c b/harbour/source/rtl/gtapi.c index e1995d15f1..f4c05f21fb 100644 --- a/harbour/source/rtl/gtapi.c +++ b/harbour/source/rtl/gtapi.c @@ -121,8 +121,9 @@ */ #include -#include "hbset.h" + #include "hbapigt.h" +#include "hbset.h" static SHORT s_iCurrentRow = 0; static SHORT s_iCurrentCol = 0; diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index ac6cbcc2ad..df52b72170 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -90,10 +90,10 @@ #define HB_OS_WIN_32_USED #include "hbapi.h" -#include "hbvm.h" #include "hbapierr.h" #include "hbapiitm.h" #include "hbapigt.h" +#include "hbvm.h" #include "hbset.h" #include "inkey.ch" #include "hbinit.h" diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c index 91600a797b..cf074eace8 100644 --- a/harbour/source/rtl/setcolor.c +++ b/harbour/source/rtl/setcolor.c @@ -34,8 +34,8 @@ */ #include "hbapi.h" -#include "hbset.h" #include "hbapigt.h" +#include "hbset.h" char * hb_setColor( char * szColor ) { diff --git a/harbour/source/rtl/strings.c b/harbour/source/rtl/strings.c index 8ad7849a74..ba32a258c1 100644 --- a/harbour/source/rtl/strings.c +++ b/harbour/source/rtl/strings.c @@ -53,10 +53,10 @@ #include #include "hbapi.h" -#include "hbdate.h" #include "hbapiitm.h" #include "hbapierr.h" #include "hbset.h" +#include "hbdate.h" #define HB_ISSPACE( c ) ( ( c ) == ' ' || \ ( c ) == HB_CHAR_HT || \ diff --git a/harbour/source/rtl/tone.c b/harbour/source/rtl/tone.c index 034d1e625d..79b5e667ff 100644 --- a/harbour/source/rtl/tone.c +++ b/harbour/source/rtl/tone.c @@ -63,7 +63,6 @@ #elif defined(_Windows) || defined(_WIN32) #if defined(_MSC_VER) #define HB_OS_WIN_32_USED - #include "hbdefs.h" #endif #elif defined(__MINGW32__) #include diff --git a/harbour/source/vm/codebloc.c b/harbour/source/vm/codebloc.c index 6b7c2e72c7..81a21e5fc9 100644 --- a/harbour/source/vm/codebloc.c +++ b/harbour/source/vm/codebloc.c @@ -36,8 +36,8 @@ /* The Harbour implementation of codeblocks */ #include "hbapi.h" -#include "hbvm.h" #include "hbapiitm.h" +#include "hbvm.h" /* Creates the codeblock structure * diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 43aaeb5fcd..df42a4144d 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -51,12 +51,12 @@ #include #include "hbapi.h" -#include "hbvm.h" #include "hbapierr.h" #include "hbapiitm.h" #include "hbapilng.h" #include "hbapirdd.h" #include "hbapigt.h" +#include "hbvm.h" #include "hbpcode.h" #include "hbset.h" diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index d18f4f25fd..1dddce9315 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -69,8 +69,8 @@ #include "hbapi.h" #include "hbapiitm.h" -#include "hbvm.h" #include "hbapierr.h" +#include "hbvm.h" #include "hbdate.h" #include "hbset.h" diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c index a8aed3df3b..cb9f27c991 100644 --- a/harbour/source/vm/memvars.c +++ b/harbour/source/vm/memvars.c @@ -54,8 +54,8 @@ #include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" -#include "hbdate.h" /* for __MVSAVE()/__MVRESTORE() */ #include "hbapifs.h" /* for __MVSAVE()/__MVRESTORE() */ +#include "hbdate.h" /* for __MVSAVE()/__MVRESTORE() */ #include "error.ch" #include "hbmemvar.ch" diff --git a/harbour/tests/test.frm b/harbour/tests/test.frm deleted file mode 100644 index 34b3a5f011..0000000000 Binary files a/harbour/tests/test.frm and /dev/null differ