From: Paul Eggert Date: Sun, 2 Jul 2000 20:04:14 +0000 (+0000) Subject: textutils 2.0f X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=865e5f32959ed99b99f42ecd98de6158e98f53e5;p=chaz%2Ftar textutils 2.0f --- diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index aca2df3..2c14444 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,4 +1,4 @@ -# serial 2 +# serial 4 # From Paul Eggert. @@ -6,13 +6,29 @@ # so you can't declare an object of that type. # Check for this incompatibility with Standard C. -# Include stdio.h first, because otherwise this test would fail on Linux -# (at least 2.2.16) because the `_XOPEN_SOURCE 500' definition elicits +# Include stdlib.h first, because otherwise this test would fail on Linux +# (at least glibc-2.1.3) because the `_XOPEN_SOURCE 500' definition elicits # a syntax error in wchar.h due to the use of undefined __int32_t. AC_DEFUN(AC_MBSTATE_T_OBJECT, - [AC_CACHE_CHECK([for mbstate_t object type], ac_cv_type_mbstate_t_object, - [AC_TRY_COMPILE([#include + [ + # Check for the mbstate_t type. + ac_mbs_tmp=$ac_includes_default + ac_includes_default=" +$ac_includes_default +#if HAVE_WCHAR_H +# include +#endif +" + AC_CHECK_TYPE(mbstate_t, int) + # Restore the default value. + ac_includes_default=$ac_mbs_tmp + + AC_CACHE_CHECK([for mbstate_t object type], ac_cv_type_mbstate_t_object, + [AC_TRY_COMPILE([ +#if HAVE_STDLIB_H +# include +#endif #include ], [mbstate_t x; return sizeof x;], ac_cv_type_mbstate_t_object=yes,