20000315-14:28 GMT+1 Victor Szakats <info@szelvesz.hu>

harbour/ChangeLog

@@ -1,3 +1,16 @@
+20000315-14:28 GMT+1 Victor Szakats <info@szelvesz.hu>
+   * 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 <info@szelvesz.hu>
    * source/rtl/filesys.c
      source/rtl/console.c

harbour/include/hbcomp.h

@@ -47,6 +47,7 @@
 #include "hbpp.h"
 #include "hbver.h"
 #include "hbexprop.h"
+#include "hbpcode.h"
 
 /* compiler related declarations */
 

harbour/include/hbmacro.h

@@ -53,6 +53,7 @@
 #include "hbapierr.h"
 #include "hbvm.h"
 #include "hbexprop.h"
+#include "hbpcode.h"
 
 /* flags for compilation process
  */

harbour/include/hbvmpub.h

@@ -37,7 +37,6 @@
 #define HB_VMPUB_H_
 
 #include "hbdefs.h"
-#include "hbpcode.h"
 
 struct _HB_DYNS;
 

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

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 )

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                  */

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
 

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 )
 {

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 )
 {

harbour/source/pp/ppcomp.c

@@ -45,8 +45,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "hbpp.h"
-#include "hberrors.h"
 #include "hbcomp.h"
 
 extern FILES       hb_comp_files;

harbour/source/pp/ppcore.c

@@ -64,7 +64,6 @@
 #include <time.h>
 
 #include "hbpp.h"
-#include "hberrors.h"
 #include "hbcomp.h"
 
 #if defined( OS_UNIX_COMPATIBLE )

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;

harbour/source/pp/pptable.c

@@ -43,6 +43,7 @@
 #endif
 
 #include <stdio.h>
+
 #include "hbpp.h"
 
 static DEFINES sD___01 = {"_SET_ALTERNATE",NULL,-1,"18", NULL };

harbour/source/pp/stdalone/hbpp.c

@@ -49,8 +49,6 @@
 #include <malloc.h>     /* 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 );

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

harbour/source/rtl/gtapi.c

@@ -121,8 +121,9 @@
  */
 
 #include <ctype.h>
-#include "hbset.h"
+
 #include "hbapigt.h"
+#include "hbset.h"
 
 static SHORT  s_iCurrentRow = 0;
 static SHORT  s_iCurrentCol = 0;

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"

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 )
 {

harbour/source/rtl/strings.c

@@ -53,10 +53,10 @@
 #include <ctype.h>
 
 #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 || \

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 <stdlib.h>

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
  *

harbour/source/vm/hvm.c

@@ -51,12 +51,12 @@
 #include <math.h>
 
 #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"
 

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"
 

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"