diff options
Diffstat (limited to 'm4/intmax_t.m4')
-rw-r--r-- | m4/intmax_t.m4 | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 9571814f..b9cb27ff 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -6,15 +6,23 @@ AC_PREREQ(2.52) # Define intmax_t to long or long long if <inttypes.h> doesn't define. -AC_DEFUN([jm_AC_TYPE_INTMAX_T], +AC_DEFUN([gl_AC_TYPE_INTMAX_T], [ - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) - AC_CHECK_TYPE(intmax_t, , - [test $ac_cv_type_long_long = yes \ - && ac_type='long long' \ - || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, - [Define to widest signed type if <inttypes.h> doesn't define.])]) + dnl For simplicity, we assume that a header file defines 'intmax_t' if and + dnl only if it defines 'uintmax_t'. + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) + test $ac_cv_type_long_long = yes \ + && ac_type='long long' \ + || ac_type='long' + AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + [Define to long or long long if <inttypes.h> and <stdint.h> don't define.]) + else + AC_DEFINE(HAVE_INTMAX_T, 1, + [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) + fi ]) # Define uintmax_t to unsigned long or unsigned long long |