We will cross that bridge when we come to it.

[pdclib] / functions / inttypes / strtoimax.c

diff --git a/functions/inttypes/strtoimax.c b/functions/inttypes/strtoimax.c
old mode 100755 (executable)
new mode 100644 (file)
index 936389c..5bd7ec6
--- a/functions/inttypes/strtoimax.c
+++ b/functions/inttypes/strtoimax.c
@@ -25,7 +25,6 @@ intmax_t strtoimax( const char * _PDCLIB_restrict nptr, char ** _PDCLIB_restrict
     }
     else
     {
-        /* FIXME: This breaks on some machines that round negatives wrongly */
         rc = (intmax_t)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)INTMAX_MIN, (uintmax_t)( INTMAX_MIN / -base ), (int)( -( INTMAX_MIN % base ) ), &sign );
     }
     if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) nptr;
@@ -88,7 +87,7 @@ int main( void )
     /* one-complement and signed magnitude just as well. Anyone having a   */
     /* platform to test this on?                                           */
     errno = 0;
-#if INTMAX_MAX == 0x7fffffffffffffffLL
+#if INTMAX_MAX >> 62 == 1
     /* testing "even" overflow, i.e. base is power of two */
     TESTCASE( strtoimax( "9223372036854775807", NULL, 0 ) == INTMAX_MAX );
     TESTCASE( errno == 0 );
@@ -102,7 +101,7 @@ int main( void )
     TESTCASE( strtoimax( "-9223372036854775809", NULL, 0 ) == INTMAX_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
-#elif LLONG_MAX == 0x7fffffffffffffffffffffffffffffffLL
+#elif LLONG_MAX >> 126 == 1
     /* testing "even" overflow, i.e. base is power of two */
     TESTCASE( strtoimax( "170141183460469231731687303715884105728", NULL, 0 ) == INTMAX_MAX );
     TESTCASE( errno == 0 );