diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-04-05 12:24:52 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-04-05 16:32:42 +0200 |
| commit | b780e8dc0ca111f94e2c0fa0bc926fce87507b4b (patch) | |
| tree | cf53f8e9da3610f1f37bb6ef86cd216feae05b23 /m4/wcsrtombs.m4 | |
| parent | fb0549ab84015164134e81d3c5da9578587dfca3 (diff) | |
| download | gnulib-b780e8dc0ca111f94e2c0fa0bc926fce87507b4b.tar.gz | |
mbsinit, mbrtowc, wcrtomb: Improve idioms.
Diffstat (limited to 'm4/wcsrtombs.m4')
| -rw-r--r-- | m4/wcsrtombs.m4 | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4 index e4f39a7dc7..fb769f2d62 100644 --- a/m4/wcsrtombs.m4 +++ b/m4/wcsrtombs.m4 @@ -1,4 +1,4 @@ -# wcsrtombs.m4 serial 4 +# wcsrtombs.m4 serial 5 dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,28 +10,29 @@ AC_DEFUN([gl_FUNC_WCSRTOMBS], AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN - if test $REPLACE_MBSTATE_T = 1; then - REPLACE_WCSRTOMBS=1 - fi + AC_CHECK_FUNCS_ONCE([wcsrtombs]) if test $ac_cv_func_wcsrtombs = no; then HAVE_WCSRTOMBS=0 - fi - if test $HAVE_WCSRTOMBS != 0 && test $REPLACE_WCSRTOMBS != 1; then - gl_WCSRTOMBS_TERMINATION - gl_WCSRTOMBS_NULL - case "$gl_cv_func_wcsrtombs_termination" in - *yes) ;; - *) AC_DEFINE([WCSRTOMBS_TERMINATION_BUG], [1], - [Define if the wcsrtombs function may set the source pointer to NULL without NUL-terminating the destination.]) - REPLACE_WCSRTOMBS=1 ;; - esac - case "$gl_cv_func_wcsrtombs_null" in - *yes) ;; - *) AC_DEFINE([WCSRTOMBS_NULL_ARG_BUG], [1], - [Define if the wcsrtombs function has the NULL destination argument bug.]) - REPLACE_WCSRTOMBS=1 ;; - esac + else + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_WCSRTOMBS=1 + else + gl_WCSRTOMBS_TERMINATION + gl_WCSRTOMBS_NULL + case "$gl_cv_func_wcsrtombs_termination" in + *yes) ;; + *) AC_DEFINE([WCSRTOMBS_TERMINATION_BUG], [1], + [Define if the wcsrtombs function may set the source pointer to NULL without NUL-terminating the destination.]) + REPLACE_WCSRTOMBS=1 ;; + esac + case "$gl_cv_func_wcsrtombs_null" in + *yes) ;; + *) AC_DEFINE([WCSRTOMBS_NULL_ARG_BUG], [1], + [Define if the wcsrtombs function has the NULL destination argument bug.]) + REPLACE_WCSRTOMBS=1 ;; + esac + fi fi if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then gl_REPLACE_WCHAR_H |