Bruno Haible wrote: > Derek R. Price wrote: >> * m4/onceonly.m4, >> m4/onceonly_2_57.m4 >> Don't call obsolescent AC_HEADER_STDC. > > It's not called there, it's only used as an example. I've changed it > like this.
... Bruno Haible wrote: > Derek R. Price wrote: >> > lib/mbswidth.c: Remove sections >> > dependent on !STDC_HEADERS. > > Thanks, I committed to gnulib the same patch that I had done in gettext > a day earlier. It is identical to yours. Thanks Bruno, I've updated my patch (attached) to remove the two change sets you installed. I've also added some changes to getdate.y since I missed it the first time. This is what's left: 2006-06-29 Derek R. Price <[EMAIL PROTECTED]> * lib/exclude.c, lib/exit.h, lib/fnmatch.c, lib/fnmatch_loop.c, lib/getdate.y, lib/getusershell.c, lib/mbswidth.c, lib/memcasecmp.c, lib/strtod.c, lib/strtol.c, lib/xstrtol.c: Remove sections dependent on !STDC_HEADERS. * m4/calloc.m4, m4/exclude.m4, m4/getdate.m4, m4/gettext.m4, m4/getusershell.m4, m4/memcasecmp.m4, m4/strtod.m4, m4/strtol.m4, m4/xstrtol.m4: Don't call obsolescent AC_HEADER_STDC. Derek -- Derek R. Price CVS Solutions Architect Get CVS support at Ximbiot <http://ximbiot.com>! v: +1 248.835.1260 f: +1 248.835.1263 <mailto:[EMAIL PROTECTED]>
Index: lib/exclude.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v retrieving revision 1.28 diff -u -p -r1.28 exclude.c --- lib/exclude.c 25 May 2006 07:02:07 -0000 1.28 +++ lib/exclude.c 5 Jul 2006 14:46:27 -0000 @@ -43,18 +43,6 @@ # include "unlocked-io.h" #endif -#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII) -# define IN_CTYPE_DOMAIN(c) true -#else -# define IN_CTYPE_DOMAIN(c) isascii (c) -#endif - -static inline bool -is_space (unsigned char c) -{ - return IN_CTYPE_DOMAIN (c) && isspace (c); -} - /* Non-GNU systems lack these options, so we don't need to check them. */ #ifndef FNM_CASEFOLD # define FNM_CASEFOLD 0 @@ -244,12 +232,12 @@ add_exclude_file (void (*add_func) (stru { char *pattern_end = p; - if (is_space (line_end)) + if (isspace (line_end)) { for (; ; pattern_end--) if (pattern_end == pattern) goto next_pattern; - else if (! is_space (pattern_end[-1])) + else if (! isspace (pattern_end[-1])) break; } Index: lib/exit.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/exit.h,v retrieving revision 1.2 diff -u -p -r1.2 exit.h --- lib/exit.h 14 May 2005 06:03:58 -0000 1.2 +++ lib/exit.h 5 Jul 2006 14:46:27 -0000 @@ -21,7 +21,7 @@ /* Get exit() declaration. */ #include <stdlib.h> -/* Some systems do not define EXIT_*, even with STDC_HEADERS. */ +/* Some systems do not define EXIT_*, despite otherwise supporting C89. */ #ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 #endif Index: lib/fnmatch.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fnmatch.c,v retrieving revision 1.33 diff -u -p -r1.33 fnmatch.c --- lib/fnmatch.c 27 Jan 2006 18:40:27 -0000 1.33 +++ lib/fnmatch.c 5 Jul 2006 14:46:27 -0000 @@ -86,34 +86,17 @@ extern int fnmatch (const char *pattern, #if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU -# if defined STDC_HEADERS || !defined isascii -# define ISASCII(c) 1 -# else -# define ISASCII(c) isascii(c) -# endif - # ifdef isblank -# define ISBLANK(c) (ISASCII (c) && isblank (c)) +# define ISBLANK(c) isblank(c) # else # define ISBLANK(c) ((c) == ' ' || (c) == '\t') # endif # ifdef isgraph -# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) +# define ISGRAPH(c) isgraph(c) # else -# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) +# define ISGRAPH(c) (isprint (c) && !isspace (c)) # endif -# define ISPRINT(c) (ISASCII (c) && isprint (c)) -# define ISDIGIT(c) (ISASCII (c) && isdigit (c)) -# define ISALNUM(c) (ISASCII (c) && isalnum (c)) -# define ISALPHA(c) (ISASCII (c) && isalpha (c)) -# define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) -# define ISLOWER(c) (ISASCII (c) && islower (c)) -# define ISPUNCT(c) (ISASCII (c) && ispunct (c)) -# define ISSPACE(c) (ISASCII (c) && isspace (c)) -# define ISUPPER(c) (ISASCII (c) && isupper (c)) -# define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) - # define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) # if defined _LIBC || WIDE_CHAR_SUPPORT Index: lib/fnmatch_loop.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fnmatch_loop.c,v retrieving revision 1.11 diff -u -p -r1.11 fnmatch_loop.c --- lib/fnmatch_loop.c 27 Jan 2006 18:40:27 -0000 1.11 +++ lib/fnmatch_loop.c 5 Jul 2006 14:46:27 -0000 @@ -288,18 +288,18 @@ FCT (const CHAR *pattern, const CHAR *st goto matched; # endif #else - if ((STREQ (str, L_("alnum")) && ISALNUM ((UCHAR) *n)) - || (STREQ (str, L_("alpha")) && ISALPHA ((UCHAR) *n)) + if ((STREQ (str, L_("alnum")) && isalnum ((UCHAR) *n)) + || (STREQ (str, L_("alpha")) && isalpha ((UCHAR) *n)) || (STREQ (str, L_("blank")) && ISBLANK ((UCHAR) *n)) - || (STREQ (str, L_("cntrl")) && ISCNTRL ((UCHAR) *n)) - || (STREQ (str, L_("digit")) && ISDIGIT ((UCHAR) *n)) + || (STREQ (str, L_("cntrl")) && iscntrl ((UCHAR) *n)) + || (STREQ (str, L_("digit")) && isdigit ((UCHAR) *n)) || (STREQ (str, L_("graph")) && ISGRAPH ((UCHAR) *n)) - || (STREQ (str, L_("lower")) && ISLOWER ((UCHAR) *n)) - || (STREQ (str, L_("print")) && ISPRINT ((UCHAR) *n)) - || (STREQ (str, L_("punct")) && ISPUNCT ((UCHAR) *n)) - || (STREQ (str, L_("space")) && ISSPACE ((UCHAR) *n)) - || (STREQ (str, L_("upper")) && ISUPPER ((UCHAR) *n)) - || (STREQ (str, L_("xdigit")) && ISXDIGIT ((UCHAR) *n))) + || (STREQ (str, L_("lower")) && islower ((UCHAR) *n)) + || (STREQ (str, L_("print")) && isprint ((UCHAR) *n)) + || (STREQ (str, L_("punct")) && ispunct ((UCHAR) *n)) + || (STREQ (str, L_("space")) && isspace ((UCHAR) *n)) + || (STREQ (str, L_("upper")) && isupper ((UCHAR) *n)) + || (STREQ (str, L_("xdigit")) && isxdigit ((UCHAR) *n))) goto matched; #endif c = *p++; Index: lib/getdate.y =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/getdate.y,v retrieving revision 1.103 diff -u -p -r1.103 getdate.y --- lib/getdate.y 11 Jun 2006 07:12:27 -0000 1.103 +++ lib/getdate.y 5 Jul 2006 14:46:27 -0000 @@ -68,15 +68,6 @@ #include "setenv.h" #include "xalloc.h" -#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii (c) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) -#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) -#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) /* ISDIGIT differs from isdigit, as follows: - Its arg may be any int or unsigned int; it need not be an unsigned char. @@ -896,7 +887,7 @@ lookup_word (parser_control const *pc, c for (p = word; *p; p++) { unsigned char ch = *p; - if (ISLOWER (ch)) + if (islower (ch)) *p = toupper (ch); } @@ -962,7 +953,7 @@ yylex (YYSTYPE *lvalp, parser_control *p for (;;) { - while (c = *pc->input, ISSPACE (c)) + while (c = *pc->input, isspace (c)) pc->input++; if (ISDIGIT (c) || c == '-' || c == '+') @@ -973,7 +964,7 @@ yylex (YYSTYPE *lvalp, parser_control *p if (c == '-' || c == '+') { sign = c == '-' ? -1 : 1; - while (c = *++pc->input, ISSPACE (c)) + while (c = *++pc->input, isspace (c)) continue; if (! ISDIGIT (c)) /* skip the '-' sign */ @@ -1077,7 +1068,7 @@ yylex (YYSTYPE *lvalp, parser_control *p } } - if (ISALPHA (c)) + if (isalpha (c)) { char buff[20]; char *p = buff; @@ -1089,7 +1080,7 @@ yylex (YYSTYPE *lvalp, parser_control *p *p++ = c; c = *++pc->input; } - while (ISALPHA (c) || c == '.'); + while (isalpha (c) || c == '.'); *p = '\0'; tp = lookup_word (pc, buff); @@ -1201,7 +1192,7 @@ get_date (struct timespec *result, char if (! tmp) return false; - while (c = *p, ISSPACE (c)) + while (c = *p, isspace (c)) p++; if (strncmp (p, "TZ=\"", 4) == 0) Index: lib/getusershell.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/getusershell.c,v retrieving revision 1.22 diff -u -p -r1.22 getusershell.c --- lib/getusershell.c 23 Sep 2005 04:15:13 -0000 1.22 +++ lib/getusershell.c 5 Jul 2006 14:46:27 -0000 @@ -43,14 +43,6 @@ # include "unlocked-io.h" #endif -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) - static size_t readname (char **, size_t *, FILE *); #if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__ @@ -152,14 +144,14 @@ readname (char **name, size_t *size, FIL size_t name_index = 0; /* Skip blank space. */ - while ((c = getc (stream)) != EOF && ISSPACE (c)) + while ((c = getc (stream)) != EOF && isspace (c)) /* Do nothing. */ ; for (;;) { if (*size <= name_index) *name = x2nrealloc (*name, size, sizeof **name); - if (c == EOF || ISSPACE (c)) + if (c == EOF || isspace (c)) break; (*name)[name_index++] = c; c = getc (stream); Index: lib/memcasecmp.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/memcasecmp.c,v retrieving revision 1.12 diff -u -p -r1.12 memcasecmp.c --- lib/memcasecmp.c 19 Sep 2005 17:28:14 -0000 1.12 +++ lib/memcasecmp.c 5 Jul 2006 14:46:27 -0000 @@ -23,19 +23,6 @@ #include <ctype.h> -#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII) -# define IN_CTYPE_DOMAIN(Char) 1 -#else -# define IN_CTYPE_DOMAIN(Char) isascii (Char) -#endif -#define ISLOWER(Char) (IN_CTYPE_DOMAIN (Char) && islower (Char)) - -#if _LIBC || STDC_HEADERS -# define TOUPPER(Char) toupper (Char) -#else -# define TOUPPER(Char) (ISLOWER (Char) ? toupper (Char) : (Char)) -#endif - #include "memcasecmp.h" /* Like memcmp, but ignore differences in case. @@ -52,7 +39,7 @@ memcasecmp (const void *vs1, const void { unsigned char u1 = s1[i]; unsigned char u2 = s2[i]; - int diff = TOUPPER (u1) - TOUPPER (u2); + int diff = toupper (u1) - toupper (u2); if (diff) return diff; } Index: lib/strtod.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/strtod.c,v retrieving revision 1.19 diff -u -p -r1.19 strtod.c --- lib/strtod.c 17 Jun 2006 19:29:36 -0000 1.19 +++ lib/strtod.c 5 Jul 2006 14:46:27 -0000 @@ -22,16 +22,6 @@ #include <ctype.h> -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) -#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) -#define TOLOWER(c) (IN_CTYPE_DOMAIN (c) ? tolower(c) : (c)) - #include <math.h> #include <float.h> @@ -64,7 +54,7 @@ strtod (const char *nptr, char **endptr) s = nptr; /* Eat whitespace. */ - while (ISSPACE (*s)) + while (isspace (*s)) ++s; /* Get the sign. */ @@ -78,7 +68,7 @@ strtod (const char *nptr, char **endptr) exponent = 0; for (;; ++s) { - if (ISDIGIT (*s)) + if (isdigit (*s)) { got_digit = 1; @@ -111,7 +101,7 @@ strtod (const char *nptr, char **endptr) if (!got_digit) goto noconv; - if (TOLOWER (*s) == 'e') + if (tolower (*s) == 'e') { /* Get the exponent specified after the `e' or `E'. */ int save = errno; Index: lib/strtol.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/strtol.c,v retrieving revision 1.25 diff -u -p -r1.25 strtol.c --- lib/strtol.c 17 Jun 2006 16:09:19 -0000 1.25 +++ lib/strtol.c 5 Jul 2006 14:46:27 -0000 @@ -208,11 +208,6 @@ # define TOUPPER(Ch) towupper (Ch) # endif #else -# if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII) -# define IN_CTYPE_DOMAIN(c) 1 -# else -# define IN_CTYPE_DOMAIN(c) isascii(c) -# endif # define L_(Ch) Ch # define UCHAR_TYPE unsigned char # define STRING_TYPE char @@ -221,9 +216,9 @@ # define ISALPHA(Ch) __isalpha_l ((Ch), loc) # define TOUPPER(Ch) __toupper_l ((Ch), loc) # else -# define ISSPACE(Ch) (IN_CTYPE_DOMAIN (Ch) && isspace (Ch)) -# define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch)) -# define TOUPPER(Ch) (IN_CTYPE_DOMAIN (Ch) ? toupper (Ch) : (Ch)) +# define ISSPACE(Ch) isspace(Ch) +# define ISALPHA(Ch) isalpha(Ch) +# define TOUPPER(Ch) toupper(Ch) # endif #endif Index: lib/xstrtol.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xstrtol.c,v retrieving revision 1.38 diff -u -p -r1.38 xstrtol.c --- lib/xstrtol.c 19 Sep 2005 17:28:15 -0000 1.38 +++ lib/xstrtol.c 5 Jul 2006 14:46:27 -0000 @@ -51,14 +51,6 @@ # define STRTOL_T_MAXIMUM TYPE_MAXIMUM (__strtol_t) #endif -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) - #if !HAVE_DECL_STRTOIMAX && !defined strtoimax intmax_t strtoimax (); #endif @@ -112,7 +104,7 @@ __xstrtol (const char *s, char **ptr, in { const char *q = s; unsigned char ch = *q; - while (ISSPACE (ch)) + while (isspace (ch)) ch = *++q; if (ch == '-') return LONGINT_INVALID; Index: m4/calloc.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/calloc.m4,v retrieving revision 1.5 diff -u -p -r1.5 calloc.m4 --- m4/calloc.m4 23 Sep 2005 04:15:13 -0000 1.5 +++ m4/calloc.m4 5 Jul 2006 14:46:27 -0000 @@ -16,8 +16,7 @@ # ------------------------------------- # If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT. AC_DEFUN([_AC_FUNC_CALLOC_IF], -[AC_REQUIRE([AC_HEADER_STDC])dnl -AC_REQUIRE([AC_TYPE_SIZE_T])dnl +[AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull, [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])], Index: m4/exclude.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/exclude.m4,v retrieving revision 1.6 diff -u -p -r1.6 exclude.m4 --- m4/exclude.m4 21 Mar 2005 22:06:27 -0000 1.6 +++ m4/exclude.m4 5 Jul 2006 14:46:27 -0000 @@ -11,6 +11,5 @@ AC_DEFUN([gl_EXCLUDE], dnl Prerequisites of lib/exclude.c. AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) ]) Index: m4/getdate.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/getdate.m4,v retrieving revision 1.8 diff -u -p -r1.8 getdate.m4 --- m4/getdate.m4 22 Sep 2005 23:08:15 -0000 1.8 +++ m4/getdate.m4 5 Jul 2006 14:46:27 -0000 @@ -29,7 +29,6 @@ AC_DEFUN([gl_GETDATE], dnl Prerequisites of lib/getdate.y. AC_REQUIRE([gl_BISON]) AC_REQUIRE([gl_C_COMPOUND_LITERALS]) - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) AC_STRUCT_TIMEZONE AC_REQUIRE([gl_CLOCK_TIME]) Index: m4/gettext.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/gettext.m4,v retrieving revision 1.32 diff -u -p -r1.32 gettext.m4 --- m4/gettext.m4 25 Apr 2005 13:23:48 -0000 1.32 +++ m4/gettext.m4 5 Jul 2006 14:46:28 -0000 @@ -365,7 +365,6 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([gt_GLIBC2])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_C_CONST])dnl AC_REQUIRE([bh_C_SIGNED])dnl AC_REQUIRE([AC_C_INLINE])dnl Index: m4/getusershell.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/getusershell.m4,v retrieving revision 1.4 diff -u -p -r1.4 getusershell.m4 --- m4/getusershell.m4 23 Jan 2005 08:06:57 -0000 1.4 +++ m4/getusershell.m4 5 Jul 2006 14:46:28 -0000 @@ -14,6 +14,5 @@ AC_DEFUN([gl_FUNC_GETUSERSHELL], # Prerequisites of lib/getusershell.c. AC_DEFUN([gl_PREREQ_GETUSERSHELL], [ - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) ]) Index: m4/memcasecmp.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/memcasecmp.m4,v retrieving revision 1.3 diff -u -p -r1.3 memcasecmp.m4 --- m4/memcasecmp.m4 21 Mar 2005 22:06:27 -0000 1.3 +++ m4/memcasecmp.m4 5 Jul 2006 14:46:28 -0000 @@ -10,6 +10,5 @@ AC_DEFUN([gl_MEMCASECMP], AC_LIBOBJ([memcasecmp]) dnl Prerequisites of lib/memcasecmp.c. - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) ]) Index: m4/strtod.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/strtod.m4,v retrieving revision 1.6 diff -u -p -r1.6 strtod.m4 --- m4/strtod.m4 23 Jan 2005 08:06:57 -0000 1.6 +++ m4/strtod.m4 5 Jul 2006 14:46:28 -0000 @@ -17,6 +17,5 @@ AC_DEFUN([gl_FUNC_STRTOD], # Prerequisites of lib/strtod.c. # The need for pow() is already handled by AC_FUNC_STRTOD. AC_DEFUN([gl_PREREQ_STRTOD], [ - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) ]) Index: m4/strtol.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/strtol.m4,v retrieving revision 1.3 diff -u -p -r1.3 strtol.m4 --- m4/strtol.m4 23 Jan 2005 08:06:57 -0000 1.3 +++ m4/strtol.m4 5 Jul 2006 14:46:28 -0000 @@ -14,6 +14,5 @@ AC_DEFUN([gl_FUNC_STRTOL], # Prerequisites of lib/strtol.c. AC_DEFUN([gl_PREREQ_STRTOL], [ - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) ]) Index: m4/xstrtol.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/xstrtol.m4,v retrieving revision 1.8 diff -u -p -r1.8 xstrtol.m4 --- m4/xstrtol.m4 21 Mar 2005 22:06:27 -0000 1.8 +++ m4/xstrtol.m4 5 Jul 2006 14:46:28 -0000 @@ -25,7 +25,6 @@ AC_DEFUN([gl_PREREQ_XSTRTOL_H], AC_DEFUN([gl_PREREQ_XSTRTOL], [ AC_REQUIRE([gl_PREREQ_XSTRTOL_H]) - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_FUNCS_ONCE(isascii) AC_CHECK_DECLS([strtoimax, strtoumax]) ])