From afad88a1cc91cb752103d7aa1ce34384ddb04c05 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 13 Apr 2007 09:26:28 +0000 Subject: [PATCH] 2007-04-13 11:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/common.mak ! updated for new files * harbour/contrib/libct/Makefile - harbour/contrib/libct/math.c + harbour/contrib/libct/ctmath2.c * harbour/contrib/libct/makefile.bc * harbour/contrib/libct/makefile.vc * renamed math.c to ctmath2.c --- harbour/ChangeLog | 11 ++++++++++ harbour/common.mak | 2 ++ harbour/contrib/libct/Makefile | 2 +- harbour/contrib/libct/{math.c => ctmath2.c} | 23 ++++++++++----------- harbour/contrib/libct/makefile.bc | 10 ++++----- harbour/contrib/libct/makefile.vc | 4 ++-- 6 files changed, 32 insertions(+), 20 deletions(-) rename harbour/contrib/libct/{math.c => ctmath2.c} (96%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a84102dd5b..dfb573c15c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-04-13 11:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/common.mak + ! updated for new files + + * harbour/contrib/libct/Makefile + - harbour/contrib/libct/math.c + + harbour/contrib/libct/ctmath2.c + * harbour/contrib/libct/makefile.bc + * harbour/contrib/libct/makefile.vc + * renamed math.c to ctmath2.c + 2007-04-13 03:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbapi.h + harbour/include/hbapidbg.h diff --git a/harbour/common.mak b/harbour/common.mak index a11865f661..df390f07cf 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -258,6 +258,7 @@ COMPILER_LIB_OBJS = \ $(OBJ_DIR)\cmdcheck.obj \ $(OBJ_DIR)\hbcomp.obj \ $(OBJ_DIR)\hbcmplib.obj \ + $(OBJ_DIR)\hbdbginf.obj \ $(OBJ_DIR)\hbdead.obj \ $(OBJ_DIR)\hbstripl.obj \ $(OBJ_DIR)\hbusage.obj \ @@ -290,6 +291,7 @@ VM_COMMON_LIB_OBJS = \ $(OBJ_DIR)\classes.obj \ $(OBJ_DIR)\cmdarg.obj \ $(OBJ_DIR)\codebloc.obj \ + $(OBJ_DIR)\dbgentry.obj \ $(OBJ_DIR)\debug.obj \ $(OBJ_DIR)\dynlibhb.obj \ $(OBJ_DIR)\dynsym.obj \ diff --git a/harbour/contrib/libct/Makefile b/harbour/contrib/libct/Makefile index 6febd4c0ef..d68d0b6b20 100644 --- a/harbour/contrib/libct/Makefile +++ b/harbour/contrib/libct/Makefile @@ -25,6 +25,7 @@ C_SOURCES = \ count.c \ ctc.c \ ctmath.c \ + ctmath2.c \ ctset.c \ ctstr.c \ ctchksum.c \ @@ -37,7 +38,6 @@ C_SOURCES = \ ftoc.c \ justify.c \ keyset.c \ - math.c \ misc1.c \ num1.c \ numat.c \ diff --git a/harbour/contrib/libct/math.c b/harbour/contrib/libct/ctmath2.c similarity index 96% rename from harbour/contrib/libct/math.c rename to harbour/contrib/libct/ctmath2.c index 5d6896371d..eb27eaefe7 100644 --- a/harbour/contrib/libct/math.c +++ b/harbour/contrib/libct/ctmath2.c @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + /* * Harbour Project source code: * @@ -107,7 +111,7 @@ HB_FUNC( FLOOR ) hb_mathResetError(); dResult = floor (dInput); - hb_retni( (int)dResult ); + hb_retnlen( dResult, 0, 0 ); } else { @@ -121,8 +125,7 @@ HB_FUNC( FLOOR ) if (pSubst != NULL) { - hb_itemReturn (pSubst); - hb_itemRelease (pSubst); + hb_itemRelease( hb_itemReturnForward( pSubst ) ); } else { @@ -179,7 +182,7 @@ HB_FUNC( CEILING ) hb_mathResetError(); dResult = ceil (dInput); - hb_retni( (int)dResult ); + hb_retnlen( dResult, 0, 0 ); } else { @@ -193,8 +196,7 @@ HB_FUNC( CEILING ) if (pSubst != NULL) { - hb_itemReturn (pSubst); - hb_itemRelease (pSubst); + hb_itemRelease( hb_itemReturnForward( pSubst ) ); } else { @@ -274,8 +276,7 @@ HB_FUNC( SIGN ) if (pSubst != NULL) { - hb_itemReturn (pSubst); - hb_itemRelease (pSubst); + hb_itemRelease( hb_itemReturnForward( pSubst ) ); } else { @@ -375,8 +376,7 @@ HB_FUNC( LOG10 ) if (pSubst != NULL) { - hb_itemReturn (pSubst); - hb_itemRelease (pSubst); + hb_itemRelease( hb_itemReturnForward( pSubst ) ); } else { @@ -459,8 +459,7 @@ HB_FUNC( FACT ) if (pSubst != NULL) { - hb_itemReturn (pSubst); - hb_itemRelease (pSubst); + hb_itemRelease( hb_itemReturnForward( pSubst ) ); } else { diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc index ab1d985bed..2429faa94c 100644 --- a/harbour/contrib/libct/makefile.bc +++ b/harbour/contrib/libct/makefile.bc @@ -110,6 +110,7 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\count.obj \ $(OBJ_DIR)\ctc.obj \ $(OBJ_DIR)\ctmath.obj \ + $(OBJ_DIR)\ctmath2.obj \ $(OBJ_DIR)\ctset.obj \ $(OBJ_DIR)\ctstr.obj \ $(OBJ_DIR)\ctchksum.obj \ @@ -122,7 +123,6 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\ftoc.obj \ $(OBJ_DIR)\justify.obj \ $(OBJ_DIR)\keyset.obj \ - $(OBJ_DIR)\math.obj \ $(OBJ_DIR)\misc1.obj \ $(OBJ_DIR)\num1.obj \ $(OBJ_DIR)\numat.obj \ @@ -252,6 +252,10 @@ $(OBJ_DIR)\ctmath.obj : $(TOOLS_DIR)\ctmath.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\ctmath2.obj : $(TOOLS_DIR)\ctmath2.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\ctset.obj : $(TOOLS_DIR)\ctset.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, @@ -300,10 +304,6 @@ $(OBJ_DIR)\keyset.obj : $(TOOLS_DIR)\keyset.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, -$(OBJ_DIR)\math.obj : $(TOOLS_DIR)\math.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, - $(OBJ_DIR)\misc1.obj : $(TOOLS_DIR)\misc1.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc index 0a1053714a..44389a4db5 100644 --- a/harbour/contrib/libct/makefile.vc +++ b/harbour/contrib/libct/makefile.vc @@ -130,6 +130,7 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\count.obj \ $(OBJ_DIR)\ctc.obj \ $(OBJ_DIR)\ctmath.obj \ + $(OBJ_DIR)\ctmath2.obj \ $(OBJ_DIR)\ctset.obj \ $(OBJ_DIR)\ctstr.obj \ $(OBJ_DIR)\ctchksum.obj \ @@ -139,7 +140,6 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\ftoc.obj \ $(OBJ_DIR)\justify.obj \ $(OBJ_DIR)\keyset.obj \ - $(OBJ_DIR)\math.obj \ $(OBJ_DIR)\misc1.obj \ $(OBJ_DIR)\num1.obj \ $(OBJ_DIR)\numat.obj \ @@ -201,6 +201,7 @@ CLEAN: -@if exist $(OBJ_DIR)\count.* del $(OBJ_DIR)\count.* -@if exist $(OBJ_DIR)\ctc.* del $(OBJ_DIR)\ctc.* -@if exist $(OBJ_DIR)\ctmath.* del $(OBJ_DIR)\ctmath.* + -@if exist $(OBJ_DIR)\ctmath2.* del $(OBJ_DIR)\ctmath2.* -@if exist $(OBJ_DIR)\ctset.* del $(OBJ_DIR)\ctset.* -@if exist $(OBJ_DIR)\ctstr.* del $(OBJ_DIR)\ctstr.* -@if exist $(OBJ_DIR)\ctchksum.* del $(OBJ_DIR)\ctchksum.* @@ -209,7 +210,6 @@ CLEAN: -@if exist $(OBJ_DIR)\finan.* del $(OBJ_DIR)\finan.* -@if exist $(OBJ_DIR)\ftoc.* del $(OBJ_DIR)\ftoc.* -@if exist $(OBJ_DIR)\justify.* del $(OBJ_DIR)\justify.* - -@if exist $(OBJ_DIR)\math.* del $(OBJ_DIR)\math.* -@if exist $(OBJ_DIR)\misc1.* del $(OBJ_DIR)\misc1.* -@if exist $(OBJ_DIR)\num1.* del $(OBJ_DIR)\num1.* -@if exist $(OBJ_DIR)\numat.* del $(OBJ_DIR)\numat.*