*** empty log message ***

1999-07-29 10:31:03 +00:00
parent c9d8ea633e
commit 4909cbd44d
21 changed files with 62 additions and 59 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,39 @@
+19990729-12:13 CET Victor Szel <info@szelvesz.hu>
+  + include/extend.h - 
+    hb_strLower(), hb_strUpper() declarations added.
+    extern STACK stack; added
+    extern SYMBOL symEval; added
+    extern HB_ITEM errorBlock; added
+    extern HB_ITEM aStatics; added
+  - source/rdd/dbcmd.c
+    source/rtl/setcolor.c
+    now redundant hb_strUpper() declarations removed.
+  - source/rtl/transfrm.c
+    source/rtl/classes.c
+    source/rtl/arrays.c
+    source/rtl/math.c
+    source/rtl/itemapi.c
+    source/rtl/extend.c
+    source/rtl/dir.c
+    source/rtl/descend.c
+    source/rtl/dates.c
+    source/rtl/codebloc.c
+    source/rtl/errorapi.c
+    source/rdd/dbcmd.c
+    source/hbpp/preproc.c
+    source/tools/debug.c
+    Removed explicit references to above added externs.
+  + include/dates.h - 
+    extern char *hb_monthsname[]; added
+    extern char *hb_daysname[]; added
+  - source/rtl/dates.c
+    source/tools/dates2.c  
+    Removed explicit references to above added externs.
+  - source/rtl/classes.c - Removed reference to DoBlock()
+  - source/rtl/codebloc.c - Redefinition of TRUE/FALSE removed.
+  + source/rtl/dir.c - Copyright statement added for
+    hb_strMatchDOS() function.
+
 19990729-11:20 CET Victor Szel <info@szelvesz.hu>
  ! tests/working/rtl_test.prg - Now returns errorlevel 1
    if anything fails, and 0 if OK. Now for sure.
--- a/harbour/include/dates.h
+++ b/harbour/include/dates.h
@@ -5,6 +5,10 @@
 #ifndef HB_DATES_H_
 #define HB_DATES_H_

+/* In msgxxx.c modules */
+extern char *hb_monthsname[];
+extern char *hb_daysname[];
+
 long     hb_dow( long d, long m, long y );
 char *   hb_dtoc( const char * szDate, char * szFormattedDate, const char * szDateFormat );
 long     hb_dateEncode( long lDay, long lMonth, long lYear );
--- a/harbour/include/extend.h
+++ b/harbour/include/extend.h
@@ -229,6 +229,11 @@ typedef struct _HB_VALUE
   HB_HANDLE hPrevMemvar;
 } HB_VALUE, * HB_VALUE_PTR;

+extern STACK stack;
+extern SYMBOL symEval;
+extern HB_ITEM errorBlock;
+extern HB_ITEM aStatics;
+
 PHB_ITEM hb_param( int iParam, WORD wType ); /* retrieve a generic parameter */
 char *   hb_parc( int iParam, ... );  /* retrieve a string parameter */
 ULONG    hb_parclen( int iParam, ... ); /* retrieve a string parameter length */
@@ -287,6 +292,8 @@ char *   hb_str( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ); /* convert
 int      hb_stricmp( const char *s1, const char *s2 );
 BOOL     hb_strempty( char * szText, ULONG ulLen );
 ULONG    hb_strAt( char *, long, char *, long );
+char *   hb_strUpper( char * szText, long lLen );
+char *   hb_strLower( char * szText, long lLen );

 HARBOURFUNC hb_GetMethod( PHB_ITEM pObject, PSYMBOL pSymMsg ); /* returns the method pointer of a object class */
 char *   hb_GetClassName( PHB_ITEM pObject ); /* retrieves an object class name */
--- a/harbour/source/hbpp/preproc.c
+++ b/harbour/source/hbpp/preproc.c
@@ -44,7 +44,6 @@
 #define SKIPTABSPACES(sptr) while ( *sptr == ' ' || *sptr == '\t' ) (sptr)++
 #define STR_SIZE 8192

-extern STACK stack;
 extern int ParseExpression( char*, char* );

 PATHNAMES *_pIncludePath = NULL;
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -94,11 +94,6 @@ HB_INIT_SYMBOLS_END( dbCmd__InitSymbols );
 #pragma startup dbCmd__InitSymbols
 #endif

-/* From strings.c */
-char * hb_strUpper( char * szText, long lLen );
-
-extern STACK stack;
-
 static char * szDefDriver;      /* Default RDD name */
 static USHORT uiCurrArea;       /* Selectd area */
 static PRDDNODE pRDDList;       /* Registered RDD's */
--- a/harbour/source/rtl/arrays.c
+++ b/harbour/source/rtl/arrays.c
@@ -59,9 +59,6 @@ HB_INIT_SYMBOLS_END( Arrays__InitSymbols );
 #pragma startup Arrays__InitSymbols
 #endif

-extern STACK  stack;
-extern SYMBOL symEval;
-
 /*
 * Internal
 */
--- a/harbour/source/rtl/classes.c
+++ b/harbour/source/rtl/classes.c
@@ -55,8 +55,6 @@
 #define MET_VIRTUAL   4
 #define MET_SUPER     5

-HARBOUR DoBlock( void );      /* executes a codeblock */
-
 typedef struct
 {
   void      * pMessage;   /* pointer to dynamic symbol when they get ready */
@@ -82,9 +80,6 @@ typedef struct
 #define BUCKET        4
 #define HASH_KEY      BASE_METHODS/BUCKET

-extern STACK stack;
-extern SYMBOL symEval;
-
 PCLASS  pClasses     = 0;
 WORD    wClasses     = 0;
 PMETHOD pMethod      = 0;
--- a/harbour/source/rtl/codebloc.c
+++ b/harbour/source/rtl/codebloc.c
@@ -38,11 +38,6 @@
 #include "extend.h"
 #include <string.h>

-extern STACK stack;
-
-#define FALSE   0
-#define TRUE    1
-
 /* functions for memvar variables
 */
 HB_HANDLE hb_MemvarValueNew( PHB_ITEM, int );
--- a/harbour/source/rtl/dates.c
+++ b/harbour/source/rtl/dates.c
@@ -53,12 +53,6 @@
   #define HB_OPTIMIZE_DTOS
 #endif

-extern STACK stack;
-
-/* In msgxxx.c modules */
-extern char *hb_monthsname[];
-extern char *hb_daysname[];
-
 HARBOUR HB_CDOW( void );
 HARBOUR HB_CMONTH( void );
 HARBOUR HB_CTOD( void );
--- a/harbour/source/rtl/descend.c
+++ b/harbour/source/rtl/descend.c
@@ -36,8 +36,6 @@
 #include <ctype.h>
 #include "init.h"

-extern STACK stack;
-
 HARBOUR HB_DESCEND(void);

 HB_INIT_SYMBOLS_BEGIN( Descend__InitSymbols )
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -14,6 +14,14 @@
 *                             been requested.
 *
 */
+
+/* Harbour Project source code
+   http://www.Harbour-Project.org/
+   The following function is Copyright 1999 Victor Szel <info@szelvesz.hu>:
+      hb_strMatchDOS().
+   See doc/hdr_tpl.txt, Version 1.2 or later, for licensing terms.
+*/
+
 #if defined(__IBMCPP__)
   #define INCL_DOSFILEMGR
   #define INCL_DOSERRORS
@@ -144,7 +152,6 @@ static  BOOL  hb_strMatchDOS (char *pszString, char *pszMask);
 HARBOUR HB_DIRECTORY( void )
 {
 #if defined(HAVE_POSIX_IO)
-   extern STACK  stack;

   PHB_ITEM arg1_it = hb_param(1,IT_STRING);
   PHB_ITEM arg2_it = hb_param(2,IT_STRING);
--- a/harbour/source/rtl/errorapi.c
+++ b/harbour/source/rtl/errorapi.c
@@ -27,10 +27,6 @@
 #include "itemapi.h"
 #include "errorapi.h"

-extern HB_ITEM errorBlock;
-extern STACK stack;
-extern SYMBOL symEval;
-
 PHB_ITEM hb_errNew( void )
 {
   PHB_ITEM pReturn = hb_itemNew( NULL );
--- a/harbour/source/rtl/extend.c
+++ b/harbour/source/rtl/extend.c
@@ -31,8 +31,6 @@
 #include "dates.h"
 #include "item.api"

-extern STACK stack;
-
 ULONG ulMemoryBlocks = 0;
 ULONG ulMemoryMaxBlocks = 0;
 ULONG ulMemoryMaxConsumed = 0;
--- a/harbour/source/rtl/itemapi.c
+++ b/harbour/source/rtl/itemapi.c
@@ -28,9 +28,6 @@
 #include "dates.h"
 #include "set.h"

-extern STACK stack;
-extern SYMBOL symEval;
-
 BOOL hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem )
 {
   BOOL bResult = FALSE;
--- a/harbour/source/rtl/math.c
+++ b/harbour/source/rtl/math.c
@@ -14,8 +14,6 @@
 #include "errorapi.h"
 #include <math.h>

-extern STACK stack;
-
 HARBOUR HB_ABS( void );
 HARBOUR HB_EXP( void );
 HARBOUR HB_INT( void );
--- a/harbour/source/rtl/objfunc.prg
+++ b/harbour/source/rtl/objfunc.prg
@@ -225,7 +225,7 @@ return oObj
 function oModMethod( oObj, cSymbol, nFuncPtr )

   if !IsMethod( oObj, cSymbol )
-      QOut( "OMODMETHOD: ", cSymbol, " doesnot exists in class." )
+      QOut( "OMODMETHOD: ", cSymbol, " does not exists in class." )
   elseif ValType( nFuncPtr ) != "N"
      QOut( "OMODMETHOD: Argument type error <nFuncPtr>" )
   elseif ValType( oObj ) != "O"
@@ -244,7 +244,7 @@ return oObj
 function oModInline( oObj, cSymbol, bInline )

   if !IsMethod( oObj, cSymbol )
-      QOut( "OMODINLINE: ", cSymbol, " doesnot exists in class." )
+      QOut( "OMODINLINE: ", cSymbol, " does not exists in class." )
   elseif ValType( bInline ) != "B"
      QOut( "OMODINLINE: Argument type error <bInline>" )
   elseif ValType( oObj ) != "O"
@@ -263,7 +263,7 @@ return oObj
 function oDelMethod( oObj, cSymbol )

   if !IsMethod( oObj, cSymbol )
-      QOut( "ODELMETHOD: ", cSymbol, " doesnot exists in class." )
+      QOut( "ODELMETHOD: ", cSymbol, " does not exists in class." )
   elseif ValType( oObj ) != "O"
      QOut( "ODELMETHOD: Argument type error <oObj>" )
   else
@@ -285,7 +285,7 @@ function oDelData( oObj, cSymbol )
   local nSeq

   if !IsData( oObj, cSymbol )
-      QOut( "ODELDATA: ", cSymbol, " doesnot exists in class." )
+      QOut( "ODELDATA: ", cSymbol, " does not exists in class." )
   elseif ValType( oObj ) != "O"
      QOut( "ODELDATA: Argument type error <oObj>" )
   else
--- a/harbour/source/rtl/setcolor.c
+++ b/harbour/source/rtl/setcolor.c
@@ -31,9 +31,6 @@
 static char old_string[ sizeof( hb_set.HB_SET_COLOR ) ];
 #endif

-/* From strings.c */
-char *hb_strUpper(char *szText, long lLen);
-
 char *hb_setColor( char *sColor )
 {
 #ifdef HARBOUR_USE_GTAPI
--- a/harbour/source/rtl/strings.c
+++ b/harbour/source/rtl/strings.c
@@ -32,8 +32,6 @@
 #include <math.h>
 #include "set.h"

-extern STACK stack;
-
 #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY
 static double infinity = 0;
 #endif
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -58,10 +58,6 @@ HB_INIT_SYMBOLS_END( Transfrm__InitSymbols );
 #pragma startup Transfrm__InitSymbols
 #endif

-extern STACK stack;
-
-void StackPop( void );                          /* TOFIX: Should go away    */
-
 /* Function flags                                                           */

 #define PF_LEFT    0x0001   /* @B */
@@ -364,6 +360,9 @@ char *NumPicture( char *szPic, long lPic, int iPicFlags, double dValue,
    dValue      : Number to picture
    lRetSize    : The size of the returned string is passed here !
 */
+
+void StackPop( void );                          /* TOFIX: Should go away    */
+
 PHB_ITEM NumDefault( double dValue )
 {                                               /* Default number           */
   PushSymbol ( hb_GetDynSym( "STR" )->pSymbol );  /* Push STR function        */
--- a/harbour/source/tools/dates2.c
+++ b/harbour/source/tools/dates2.c
@@ -73,10 +73,6 @@ HB_INIT_SYMBOLS_END( Dates2__InitSymbols );
 #pragma startup Dates2__InitSymbols
 #endif

-/* In msgxxx.c modules */
-extern char *hb_monthsname[];
-extern char *hb_daysname[];
-
 static int hb__daysinmonth[ 12 ] =
 { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };

--- a/harbour/source/tools/debug.c
+++ b/harbour/source/tools/debug.c
@@ -42,9 +42,6 @@
 #include "ctoharb.h"
 #include "itemapi.h"

-extern STACK stack;                             /* External data used       */
-extern HB_ITEM aStatics;
-
 PHB_ITEM ArrayClone( PHB_ITEM );

 /* $Doc$