From 0d51a788ed2d521d642fece94773c95ece9dfb50 Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Sat, 17 Mar 2001 19:03:06 +0000 Subject: [PATCH] 2001-03-17 21:50 GMT+3 Alexander Kresin --- harbour/ChangeLog | 13 +++++++++++++ harbour/Makefile | 1 + harbour/contrib/Makefile | 10 ++++++++++ harbour/source/rdd/dbfntx/dbfntx1.c | 6 ++++-- harbour/tests/Makefile | 5 ++++- harbour/utils/hbmake/pickfile.prg | 6 +++--- 6 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 harbour/contrib/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8702bf90ae..ad11549138 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +2001-03-17 21:50 GMT+3 Alexander Kresin + + contrib/Makefile + * Makefile + * Changes to forse contrib/libmisc to be compiled while make process + * tests/Makefile + * added again CONTRIBS=libmisc and readfile.prg moved to PRG_SOURCES + from BAD_PRG_SOURCES + * utils/hbmake/pickfile.prg + * names of include files changed to lower case ( to work under Unix ) + * source/rdd/dbfntx/dbfntx1.c + * fixed format string in printf() to be compatible with other compilers + fixed determining of the length of numeric key + 2001-03-16 16:10 UTC+0100 Ryszard Glab *doc/en/garbage.txt diff --git a/harbour/Makefile b/harbour/Makefile index 62ae535c51..5b6bddb68d 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -7,6 +7,7 @@ ROOT = ./ DIRS=\ include \ source \ + contrib \ utils \ tests \ # samples \ diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile new file mode 100644 index 0000000000..834eb2cf70 --- /dev/null +++ b/harbour/contrib/Makefile @@ -0,0 +1,10 @@ +# +# $Id$ +# + +ROOT = ../ + +DIRS=\ + libmisc \ + +include $(ROOT)config/dir.cf diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index bea09e9fc7..79e737ccf6 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -1650,7 +1650,7 @@ static ERRCODE hb_ntxIndexCreate( LPNTXINDEX pIndex ) ( LONG ) hb_numRound( hb_itemGetND( pItem ), 0 ) ); } else - sprintf( szBuffer, "%0*.0*f", pTag->KeyLength, + sprintf( szBuffer, "%0*.*f", pTag->KeyLength, pTag->KeyDec, hb_numRound( hb_itemGetND( pItem ), pTag->KeyDec ) ); } @@ -1659,7 +1659,7 @@ static ERRCODE hb_ntxIndexCreate( LPNTXINDEX pIndex ) if( pTag->KeyDec == 0 ) sprintf( szBuffer, "%0*li", pTag->KeyLength, hb_itemGetNL( pItem ) ); else - sprintf( szBuffer, "%0*.0*f", pTag->KeyLength, + sprintf( szBuffer, "%0*.*f", pTag->KeyLength, pTag->KeyDec, hb_itemGetND( pItem ) ); } szBuffer[ pTag->KeyLength ] = 0; @@ -2233,6 +2233,8 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) case HB_IT_DOUBLE: bType = 'N'; hb_itemGetNLen( pResult, (int*) &uiLen, (int*) &uiDec ); + if( uiDec ) + uiLen += uiDec + 1; /* printf( "\nLength: %d %d",uiLen,uiDec ); */ break; diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index 19502cf263..89be082e5b 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -8,6 +8,9 @@ endif ROOT = ../ +CONTRIBS=\ + libmisc\ + LIBS=\ debug \ vm \ @@ -98,6 +101,7 @@ PRG_SOURCES=\ passref.prg \ procline.prg \ procname.prg \ + readfile.prg \ readhrb.prg \ recursiv.prg \ returns.prg \ @@ -167,7 +171,6 @@ BAD_PRG_SOURCES=\ mathtest.prg \ objarr.prg \ objasign.prg \ - readfile.prg \ rtfclass.prg \ spawn.prg \ spawn2.prg \ diff --git a/harbour/utils/hbmake/pickfile.prg b/harbour/utils/hbmake/pickfile.prg index 4d7fa12127..21b1bd769d 100644 --- a/harbour/utils/hbmake/pickfile.prg +++ b/harbour/utils/hbmake/pickfile.prg @@ -70,9 +70,9 @@ */ -#include "COMMON.CH" -#include "BOX.CH" -#include "DIRECTRY.CH" +#include "common.ch" +#include "box.ch" +#include "directry.ch" *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 *+