From dd0e61f114f6573ca89267a4fa81aafec8860cd5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 9 Aug 2008 20:34:13 +0000 Subject: [PATCH] 2008-08-09 21:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/whatsnew.txt * Minor corrections. * contrib/hbclipsm/Makefile * contrib/hbclipsm/common.mak * contrib/hbclipsm/num.c + contrib/hbclipsm/numfloor.c + contrib/hbclipsm/numceil.c * Moved CEILING() and FLOOR() to separate source files to lessen the impact with colliding function names in hbct.lib. --- harbour/contrib/hbclipsm/Makefile | 2 + harbour/contrib/hbclipsm/common.mak | 2 + harbour/contrib/hbclipsm/num.c | 16 -------- harbour/contrib/hbclipsm/numceil.c | 64 +++++++++++++++++++++++++++++ harbour/contrib/hbclipsm/numfloor.c | 64 +++++++++++++++++++++++++++++ harbour/doc/whatsnew.txt | 20 ++++----- 6 files changed, 142 insertions(+), 26 deletions(-) create mode 100644 harbour/contrib/hbclipsm/numceil.c create mode 100644 harbour/contrib/hbclipsm/numfloor.c diff --git a/harbour/contrib/hbclipsm/Makefile b/harbour/contrib/hbclipsm/Makefile index 54dc613e64..594c3ef923 100644 --- a/harbour/contrib/hbclipsm/Makefile +++ b/harbour/contrib/hbclipsm/Makefile @@ -9,6 +9,8 @@ C_SOURCES=\ environ.c \ gauge.c \ num.c \ + numceil.c \ + numfloor.c \ stack.c \ status.c \ time.c \ diff --git a/harbour/contrib/hbclipsm/common.mak b/harbour/contrib/hbclipsm/common.mak index d9887d3f04..c114c75142 100644 --- a/harbour/contrib/hbclipsm/common.mak +++ b/harbour/contrib/hbclipsm/common.mak @@ -14,6 +14,8 @@ LIB_OBJS = \ $(OBJ_DIR)date$(OBJEXT) \ $(OBJ_DIR)gauge$(OBJEXT) \ $(OBJ_DIR)num$(OBJEXT) \ + $(OBJ_DIR)numceil$(OBJEXT) \ + $(OBJ_DIR)numfloor$(OBJEXT) \ $(OBJ_DIR)stack$(OBJEXT) \ $(OBJ_DIR)status$(OBJEXT) \ $(OBJ_DIR)time$(OBJEXT) \ diff --git a/harbour/contrib/hbclipsm/num.c b/harbour/contrib/hbclipsm/num.c index 64649c5b16..9b4f24c0a9 100644 --- a/harbour/contrib/hbclipsm/num.c +++ b/harbour/contrib/hbclipsm/num.c @@ -61,14 +61,6 @@ #endif #define PI ( 3.1415926535897932384626433 ) -/* Ceiling( ) --> nInteger - Return the smallest integer that is greater than or equal to -*/ -HB_FUNC( CEILING ) -{ - hb_retnl( (long) ceil( hb_parnd( 1 ) ) ); -} - /* DtoR( ) --> nRadians Convert an angle size specified in radians to degrees */ @@ -77,14 +69,6 @@ HB_FUNC( DTOR ) hb_retndlen( ( hb_parnd( 1 ) / 180 ) * PI, 10, 9 ); } -/* Floor( ) --> nInteger - Return the largest integer that is less than or equal to -*/ -HB_FUNC( FLOOR ) -{ - hb_retnl( (long) floor( hb_parnd( 1 ) ) ); -} - /* NumAsLog10( ) --> nLog10 Convert a positive number to log base 10 */ diff --git a/harbour/contrib/hbclipsm/numceil.c b/harbour/contrib/hbclipsm/numceil.c new file mode 100644 index 0000000000..70f92c3353 --- /dev/null +++ b/harbour/contrib/hbclipsm/numceil.c @@ -0,0 +1,64 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Number manipulation + * + * Copyright 2000 Jose Lalin + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include + +#include "hbapi.h" +#include "hbapiitm.h" + +/* Ceiling( ) --> nInteger + Return the smallest integer that is greater than or equal to +*/ +HB_FUNC( CEILING ) +{ + hb_retnl( (long) ceil( hb_parnd( 1 ) ) ); +} diff --git a/harbour/contrib/hbclipsm/numfloor.c b/harbour/contrib/hbclipsm/numfloor.c new file mode 100644 index 0000000000..a7000f0fac --- /dev/null +++ b/harbour/contrib/hbclipsm/numfloor.c @@ -0,0 +1,64 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Number manipulation + * + * Copyright 2000 Jose Lalin + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include + +#include "hbapi.h" +#include "hbapiitm.h" + +/* Floor( ) --> nInteger + Return the largest integer that is less than or equal to +*/ +HB_FUNC( FLOOR ) +{ + hb_retnl( (long) floor( hb_parnd( 1 ) ) ); +} diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index ea9d2f5043..36f63de884 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -51,17 +51,17 @@ Core - Source filename visible in stack traces. - ACHOICE() mouse support added. - Core Harbour level ZLIB compression functions renamed as follows: - HB_COMPRESS -> HB_ZCOMPRESS - HB_COMPRESSBOUND -> HB_ZCOMPRESSBOUND - HB_UNCOMPRESS -> HB_ZUNCOMPRESS - HB_UNCOMPRESSLEN -> HB_ZUNCOMPRESSLEN + HB_COMPRESS() -> HB_ZCOMPRESS() + HB_COMPRESSBOUND() -> HB_ZCOMPRESSBOUND() + HB_UNCOMPRESS() -> HB_ZUNCOMPRESS() + HB_UNCOMPRESSLEN() -> HB_ZUNCOMPRESSLEN() - Harbour .hrb API moved to the documented namespace as follows: - __HRBRUN -> HB_HRBRUN - __HRBLOAD -> HB_HRBLOAD - __HRBUNLOAD -> HB_HRBUNLOAD - __HRBDO -> HB_HRBDO - __HRBDOFU -> (deleted, please use DO()) - __HRBGETFU -> HB_HRBGETFUNSYM + __HRBRUN() -> HB_HRBRUN() + __HRBLOAD() -> HB_HRBLOAD() + __HRBUNLOAD() -> HB_HRBUNLOAD() + __HRBDO() -> HB_HRBDO() + __HRBDOFU() -> (deleted, please use DO()) + __HRBGETFU() -> HB_HRBGETFUNSYM() (old function names still function) Contrib