From 59bb2c12e7a31c7f1539cee594079dadbdf1667a Mon Sep 17 00:00:00 2001
From: "Gonzalo A. Diethelm" <gonzalo.diethelm@iname.com>
Date: Wed, 21 Jul 1999 19:46:59 +0000
Subject: [PATCH] Wed Jul 21 15:36:04 1999  Gonzalo A. Diethelm 
 <Gonzalo.Diethelm@jda.cl>

---
 harbour/ChangeLog                 | 19 +++++++++++++++++++
 harbour/include/Makefile          |  1 +
 harbour/include/init.h            |  6 ++++--
 harbour/include/initsymb.h        |  4 ++++
 harbour/source/compiler/harbour.y |  8 ++++----
 harbour/source/hbpp/preproc.c     |  4 +++-
 harbour/source/vm/hvm.c           |  2 --
 harbour/tests/working/Makefile    |  6 ++++++
 8 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 733fea3431..1fc4602b57 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,22 @@
+Wed Jul 21 15:36:04 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* source/compiler/harbour.y: 
+	Moved printing the "build..." message after the command line
+	arguments have been checked, so that if the user specifies -q, it
+	is not shown.
+	
+	* source/vm/hvm.c: 
+	Got rid of a couple of warnings.
+
+	* include/Makefile: 
+	* tests/working/Makefile: 
+	Updates list of files.
+	
+	* include/init.h: 
+	* include/initsymb.h: 
+	* source/hbpp/preproc.c: 
+	Updated use of RCS Id keyword.
+	
 19990721-18:39 GMT+1 Paul Tucker / Bruno Cantero <bruno@issnet.net>
   * source/compiler/harbour.y
     Added support for empty arguments in functions.
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index fb50db8f76..40606dc6b9 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -20,6 +20,7 @@ C_HEADERS=\
 	hbpp.h \
 	hbsetup.h \
 	init.h \
+	initsymb.h \
 	itemapi.h \
 	pcode.h \
 	run_exp.h \
diff --git a/harbour/include/init.h b/harbour/include/init.h
index e32adb7bde..1f0d041e31 100644
--- a/harbour/include/init.h
+++ b/harbour/include/init.h
@@ -1,7 +1,9 @@
 /*
  * $Id$
- *
- * Harbour local symbols initialization
+ */
+
+/*
+   Harbour local symbols initialization
 
    Copyright(C) 1999 by Antonio Linares.
 
diff --git a/harbour/include/initsymb.h b/harbour/include/initsymb.h
index 386640a9b3..743e62003d 100644
--- a/harbour/include/initsymb.h
+++ b/harbour/include/initsymb.h
@@ -2,6 +2,9 @@
  * $Id$
  */
 
+#ifndef HB_INITSYMB_H_
+#define HB_INITSYMB_H_
+
 /* This file contains all the Run-Time library init symbols */
 
   Arrays__InitSymbols();
@@ -24,3 +27,4 @@
 #endif  
   Transfrm__InitSymbols();
 
+#endif /* HB_INITSYMB_H_ */
diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y
index 106308a566..c5d8adf57c 100644
--- a/harbour/source/compiler/harbour.y
+++ b/harbour/source/compiler/harbour.y
@@ -1175,10 +1175,6 @@ int harbour_main( int argc, char * argv[] )
    char *szOutPath ="";
    FILENAME *pFileName =NULL;
 
-   if( !_iQuiet )
-     printf( "Harbour compiler build %i (%04d.%02d.%02d)\n", hb_build,
-              hb_year, hb_month, hb_day );
-
    if( argc > 1 )
    {
       Hbpp_init();  /* Initialization of preprocessor arrays */
@@ -1853,6 +1849,10 @@ int Include( char * szFileName, PATHNAMES *pSearch )
       return 0;
   }
 
+   if( !_iQuiet )
+     printf( "Harbour compiler build %i (%04d.%02d.%02d)\n", hb_build,
+              hb_year, hb_month, hb_day );
+
    if( ! _iQuiet )
       printf( "\nparsing file %s\n", szFileName );
 
diff --git a/harbour/source/hbpp/preproc.c b/harbour/source/hbpp/preproc.c
index 5bff0f9bae..cb0fec04cb 100644
--- a/harbour/source/hbpp/preproc.c
+++ b/harbour/source/hbpp/preproc.c
@@ -1,6 +1,8 @@
 /*
  * $Id$
- *
+ */
+
+/*
    Harbour Project source code
 
    This file contains source for a run-time preprocessing function
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index ccbeef4f99..692464f0c9 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -1065,7 +1065,6 @@ void Inc( void )
 {
    double dNumber;
    LONG lDate;
-   PHB_ITEM pError;
    WORD wDec;
 
    if( IS_NUMERIC( stack.pPos - 1 ) )
@@ -1471,7 +1470,6 @@ void Or( void )
 {
    PHB_ITEM pItem2 = stack.pPos - 1;
    PHB_ITEM pItem1 = stack.pPos - 2;
-   PHB_ITEM pError;
    int   iResult;
 
    if( IS_LOGICAL( pItem1 ) && IS_LOGICAL( pItem2 ) )
diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile
index dc5339b32a..66f8ff34f1 100644
--- a/harbour/tests/working/Makefile
+++ b/harbour/tests/working/Makefile
@@ -17,6 +17,7 @@ PRG_SOURCES=\
 	calling.prg \
 	cdow.prg \
 	clasinit.prg \
+	clasname.prg \
 	classch.prg \
 	classes.prg \
 	clsdata.prg \
@@ -28,6 +29,7 @@ PRG_SOURCES=\
 	dates.prg \
 	dates2.prg \
 	dates3.prg \
+	dates4.prg \
 	debugtst.prg \
 	descend.prg \
 	dirtest.prg \
@@ -84,12 +86,15 @@ PRG_SOURCES=\
 	set_test.prg \
 	statfun.prg \
 	statics.prg \
+	statics1.prg \
+	statics2.prg \
 	strcmp.prg \
 	strdelim.prg \
 	strings.prg \
 	strings2.prg \
 	strings3.prg \
 	strip.prg \
+	strsub.prg \
 	syserror.prg \
 	t1.prg \
 	test.prg \
@@ -103,6 +108,7 @@ PRG_SOURCES=\
 	testhtml.prg \
 	testinc.prg \
 	testmem.prg \
+	testpre.prg \
 	teststr.prg \
 	testtok.prg \
 	testvars.prg \