diff options
| author | Gaius Mulley <gaiusmod2@gmail.com> | 2023-03-15 21:30:33 +0000 |
|---|---|---|
| committer | Gaius Mulley <gaiusmod2@gmail.com> | 2023-03-15 21:30:33 +0000 |
| commit | 8f1711ef3486b0727ccf6b5aabddda5c7d986457 (patch) | |
| tree | d7b8a96fc8e4388526d6b305c82dcf3088e1da50 /libgm2 | |
| parent | 57052c6ed59c1a2ee4a67982f960e08593956955 (diff) | |
PR 109125 13 regression SIGBUS in m2pim_ldtoa_ldtoa
This patch fixes more bool int parameter mismatches
found in dtoa and ldtoa.
gcc/m2/ChangeLog:
PR modula2/109125
* gm2-libs-ch/dtoa.cc (dtoa_strtod): Replace int with bool.
* gm2-libs-ch/ldtoa.cc (ldtoa_strtold): Replace int with bool.
libgm2/ChangeLog:
PR modula2/109125
* libm2pim/dtoa.cc (TRUE): Remove.
(FALSE): Remove. Replace int with bool.
* libm2pim/ldtoa.cc (TRUE): Remove.
(FALSE): Remove. Replace int with bool.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diffstat (limited to 'libgm2')
| -rw-r--r-- | libgm2/libm2pim/dtoa.cc | 13 | ||||
| -rw-r--r-- | libgm2/libm2pim/ldtoa.cc | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/libgm2/libm2pim/dtoa.cc b/libgm2/libm2pim/dtoa.cc index 18bb079a79c..509027d778d 100644 --- a/libgm2/libm2pim/dtoa.cc +++ b/libgm2/libm2pim/dtoa.cc @@ -75,13 +75,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define NULL (void *)0 #endif -#if !defined(TRUE) -#define TRUE (1 == 1) -#endif -#if !defined(FALSE) -#define FALSE (1 == 0) -#endif - #if defined(HAVE_STDLIB_H) #if !defined(_ISOC99_SOURCE) #define _ISOC99_SOURCE @@ -110,7 +103,7 @@ typedef enum Mode { maxsignicant, decimaldigits } Mode; contain ndigits past the decimal point (ndigits may be negative). */ extern "C" double -EXPORT(strtod) (const char *s, int *error) +EXPORT(strtod) (const char *s, bool *error) { char *endp; double d; @@ -123,10 +116,10 @@ EXPORT(strtod) (const char *s, int *error) #if defined(HAVE_ERRNO_H) *error = (errno != 0); #else - *error = FALSE; + *error = false; #endif else - *error = TRUE; + *error = true; return d; } diff --git a/libgm2/libm2pim/ldtoa.cc b/libgm2/libm2pim/ldtoa.cc index d1d37f8f99b..50a65e47aa3 100644 --- a/libgm2/libm2pim/ldtoa.cc +++ b/libgm2/libm2pim/ldtoa.cc @@ -91,13 +91,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define NULL (void *)0 #endif -#if !defined(TRUE) -#define TRUE (1 == 1) -#endif -#if !defined(FALSE) -#define FALSE (1 == 0) -#endif - #define MAX_FP_DIGITS 500 typedef enum Mode { maxsignicant, decimaldigits } Mode; @@ -113,7 +106,7 @@ extern "C" int IMPORT(dtoa,calcsign) (char *p, int str_size); contain ndigits past the decimal point (ndigits may be negative). */ extern "C" long double -EXPORT(strtold) (const char *s, int *error) +EXPORT(strtold) (const char *s, bool *error) { char *endp; long double d; @@ -131,10 +124,10 @@ EXPORT(strtold) (const char *s, int *error) #if defined(HAVE_ERRNO_H) *error = (errno != 0); #else - *error = FALSE; + *error = false; #endif else - *error = TRUE; + *error = true; return d; } |