From 87b102f032aabb5e347515e326caf27a9ed1887f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Feb 2000 12:05:58 +0000 Subject: [PATCH] 20000205-13:06 GMT+1 Victor Szakats --- harbour/ChangeLog | 11 +++++++++++ harbour/include/rddapi.h | 1 + harbour/source/compiler/hbusage.c | 2 ++ harbour/source/tools/dbftools.c | 24 +++++++++--------------- harbour/tests/db_brows.prg | 10 ---------- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4c0a38c74f..6f8573da87 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +20000205-13:06 GMT+1 Victor Szakats + * tests/db_brows.prg + ! UPDATED() removed, since it's now defined in the RTL. + * include/rddapi.h + source/tools/dbftools.c + * hb_rdd*() function declration moved to rddapi.h + * source/tools/dbftools.c + ! Removed #includes not needed. Especially windows.h. + * source/compiler/hbusage.c + + Note added about switch character. + 20000205-00:32 GMT+1 Victor Szakats * source/tools/Makefile + dbftools.c added. diff --git a/harbour/include/rddapi.h b/harbour/include/rddapi.h index e770e3f31d..4171265c60 100644 --- a/harbour/include/rddapi.h +++ b/harbour/include/rddapi.h @@ -41,6 +41,7 @@ /* RDD virtual machine integration functions */ extern int hb_rddGetCurrentWorkAreaNumber( void ); +extern void * hb_rddGetCurrentWorkAreaPointer( void ); extern ERRCODE hb_rddSelectWorkAreaAlias( char * szAlias ); extern ERRCODE hb_rddSelectWorkAreaNumber( int iArea ); extern ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ); diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c index 305e7ede71..bc9a108523 100644 --- a/harbour/source/compiler/hbusage.c +++ b/harbour/source/compiler/hbusage.c @@ -78,6 +78,8 @@ void hb_compPrintUsage( char * szSelf ) "\n /10 restrict symbol length to 10 significant characters" /* TODO: "\n @ compile list of modules in " */ "\n" + "\nNotes: Use the specific option character for your platform" + "\n instead of \'/\'." , szSelf ); } diff --git a/harbour/source/tools/dbftools.c b/harbour/source/tools/dbftools.c index 38ac92fe31..e93b6a9340 100644 --- a/harbour/source/tools/dbftools.c +++ b/harbour/source/tools/dbftools.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Some dbf structure related functions * - * Copyright 2000 Alexander Kresin + * Copyright 2000 Alexander Kresin * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -33,18 +33,9 @@ * */ -#include "windows.h" #include "extend.h" -#include "init.h" -#include "itemapi.h" -#include "rddsys.ch" -#include "langapi.h" -#include "dates.h" -#include "errorapi.h" #include "rddapi.h" -extern void* hb_rddGetCurrentWorkAreaPointer( void ); - HARBOUR HB_FIELDTYPE( void ) { USHORT uiField; @@ -52,9 +43,10 @@ HARBOUR HB_FIELDTYPE( void ) AREAP pArea; uiField = hb_parni( 1 ); - pArea = (AREAP) hb_rddGetCurrentWorkAreaPointer(); + pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); pField = pArea->lpFields + uiField - 1; - hb_retc( (char*) &(pField->uiType) ); + + hb_retc( ( char * ) &( pField->uiType ) ); } HARBOUR HB_FIELDSIZE( void ) @@ -64,8 +56,9 @@ HARBOUR HB_FIELDSIZE( void ) AREAP pArea; uiField = hb_parni( 1 ); - pArea = (AREAP) hb_rddGetCurrentWorkAreaPointer(); + pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); pField = pArea->lpFields + uiField - 1; + hb_retni( pField->uiLen ); } @@ -76,7 +69,8 @@ HARBOUR HB_FIELDDECI( void ) AREAP pArea; uiField = hb_parni( 1 ); - pArea = (AREAP) hb_rddGetCurrentWorkAreaPointer(); + pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); pField = pArea->lpFields + uiField - 1; + hb_retni( pField->uiDec ); -} \ No newline at end of file +} diff --git a/harbour/tests/db_brows.prg b/harbour/tests/db_brows.prg index a5ab24ae99..cf673973fd 100644 --- a/harbour/tests/db_brows.prg +++ b/harbour/tests/db_brows.prg @@ -896,14 +896,4 @@ FUNC NUM_STR( NOM, KOLZN ) NOM := INT( NOM ) RETURN ( REPLICATE( "0", KOLZN - LEN( LTRIM( STR( NOM ) ) ) ) + LTRIM( STR( NOM ) ) ) -*+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 -*+ -*+ Function updated() -*+ -*+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 -*+ -FUNCTION updated - -RETURN .t. - *+ EOF: SAMPLE.PRG