Further testing found a typo in my previous 4 patches, which is fixed by the following additional patch. In rereading them I think they respond to all the previous comments and therefore shouldn't be controversial so I pushed them. (If I'm wrong, please feel free to fix any chaos that results. :-)
It strikes me that we should be able to do away with the APPLE_UNIVERSAL_BUILD symbol, by having the relevant values prefer to use (defined _LP64) if that expression works, but that would be a matter for a later patch. * m4/inttypes.m4 (gl_INTTYPES_H_DEFAULTS): Also provide default values for INT32_MAX_LT_INTMAX_MAX and for UINT32_MAX_LT_UINTMAX_MAX. --- ChangeLog | 6 ++++++ m4/inttypes.m4 | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7948faf..248d0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-26 Paul Eggert <egg...@cs.ucla.edu> + + inttypes: also provide default values for 32-bit tests + * m4/inttypes.m4 (gl_INTTYPES_H_DEFAULTS): Also provide default values + for INT32_MAX_LT_INTMAX_MAX and for UINT32_MAX_LT_UINTMAX_MAX. + 2011-04-25 Paul Eggert <egg...@cs.ucla.edu> strtoumax: remove dependency on strtoimax diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index ee5bc1c..1e81990 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -163,8 +163,10 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS], HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) + INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) INT64_MAX_EQ_LONG_MAX='defined _LP64'; AC_SUBST([INT64_MAX_EQ_LONG_MAX]) PRI_MACROS_BROKEN=0; AC_SUBST([PRI_MACROS_BROKEN]) PRIPTR_PREFIX=__PRIPTR_PREFIX; AC_SUBST([PRIPTR_PREFIX]) + UINT32_MAX_LT_UINTMAX_MAX=1; AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX]) UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; AC_SUBST([UINT64_MAX_EQ_ULONG_MAX]) ]) -- 1.7.4.4