# HG changeset patch # User Bruno Haible # Date 1325791134 -3600 # Node ID 32a96da07efeea7471ddd30314b1e295874aa328 # Parent ee328959515f3e626dae91fb4e08e5d73e067ba7 strtoimax: Don't force a replacement on systems where intmax_t is int. * m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Use a different test if 'intmax_t' is not larger than 'int'. Reported by Pádraig Brady . diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-05 Bruno Haible + + strtoimax: Don't force a replacement on systems where intmax_t is int. + * m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Use a different test if + 'intmax_t' is not larger than 'int'. + Reported by Pádraig Brady . + 2012-01-05 Bruno Haible doc: Mention NetBSD bugs. diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -36,17 +36,34 @@ #endif int main () { - const char *s = "4294967295"; - char *p; - intmax_t res; - errno = 0; - res = strtoimax (s, &p, 10); - if (p != s + strlen (s)) - return 1; - if (errno != 0) - return 2; - if (res != (intmax_t) 65535 * (intmax_t) 65537) - return 3; + if (sizeof (intmax_t) > sizeof (int)) + { + const char *s = "4294967295"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != (intmax_t) 65535 * (intmax_t) 65537) + return 3; + } + else + { + const char *s = "2147483647"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != 2147483647) + return 3; + } return 0; } ]])],