From fff231daa2ff7efcce121ac6c83ce0f541ac49f8 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 23 Mar 2009 15:57:39 +0000 Subject: [PATCH] 2009-03-23 17:04 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/itemapi.c * harbour/source/common/hbprintf.c * use isfinite() instead of finite() in MinGW builds. It's possible that it can resolve problems with MinGW64 builds. --- harbour/ChangeLog | 6 ++++++ harbour/source/common/hbprintf.c | 7 +++---- harbour/source/vm/itemapi.c | 5 ++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c3375b939b..1a7c7909af 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-23 17:04 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/vm/itemapi.c + * harbour/source/common/hbprintf.c + * use isfinite() instead of finite() in MinGW builds. + It's possible that it can resolve problems with MinGW64 builds. + 2009-03-23 16:06 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/pp/ppcore.c ! fixed typo in data constant values written to .ppo files diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c index e832ffb951..a224b0dcee 100644 --- a/harbour/source/common/hbprintf.c +++ b/harbour/source/common/hbprintf.c @@ -179,7 +179,7 @@ optimized. #endif -#if defined( __GNUC__ ) && defined( _ISOC99_SOURCE ) +#if defined( __GNUC__ ) && ( defined( _ISOC99_SOURCE ) || defined(__MINGW32__) ) /* use C99 macros */ # define HB_NUMTYPE( v, d ) do { \ @@ -223,7 +223,7 @@ optimized. # if defined(__RSXNT__) || defined(__EMX__) || \ defined(__XCC__) || defined(__POCC__) || \ - defined(HB_OS_HPUX) + defined(__MINGW32__) || defined(HB_OS_HPUX) # define hb_isfinite( d ) isfinite( d ) # elif !defined( __NO_LONGDOUBLE__ ) && defined( __BORLANDC__ ) # define hb_isfinite( d ) _finitel( d ) @@ -231,8 +231,7 @@ optimized. # define hb_isfinite( d ) _finite( ( double ) d ) # elif defined( __BORLANDC__ ) || defined( __WATCOMC__ ) # define hb_isfinite( d ) _finite( d ) -# elif defined(__GNUC__) || defined(__DJGPP__) || defined(__MINGW32__) || \ - defined(__LCC__) +# elif defined(__GNUC__) || defined(__DJGPP__) || defined(__LCC__) # define hb_isfinite( d ) finite( d ) # else # define hb_isfinite( d ) FALSE diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 1ecc4d27f6..1f1b8b0870 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -2241,12 +2241,11 @@ BOOL hb_itemStrBuf( char *szResult, PHB_ITEM pNumber, int iSize, int iDec ) #if defined(__RSXNT__) || defined(__EMX__) || \ defined(__XCC__) || defined(__POCC__) || \ - defined(HB_OS_HPUX) + defined(__MINGW32__) || defined(HB_OS_HPUX) # define HB_FINITE_DBL(d) ( isfinite(d)!=0 ) #elif defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER) # define HB_FINITE_DBL(d) ( _finite(d)!=0 ) -#elif defined(__GNUC__) || defined(__DJGPP__) || defined(__MINGW32__) || \ - defined(__LCC__) +#elif defined(__GNUC__) || defined(__DJGPP__) || defined(__LCC__) # define HB_FINITE_DBL(d) ( finite(d)!=0 ) #else /* added infinity check for Borland C [martin vogel] */