Mercurial > hg > octave-lyh > gnulib-hg
changeset 10949:b10927a03d08
Make mbiter, mbuiter, mbfile usable also if !HAVE_MBRTOWC.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 22 Dec 2008 03:48:56 +0100 |
parents | 21ec3c3507d9 |
children | 003490fec365 |
files | ChangeLog NEWS m4/mbfile.m4 m4/mbiter.m4 modules/mbfile modules/mbiter modules/mbuiter |
diffstat | 7 files changed, 32 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2008-12-21 Bruno Haible <bruno@clisp.org> + + Make mbiter.h, mbuiter.h, mbfile.h usable unconditionally. + * modules/mbiter (Depends-on): Add mbrtowc, mbsinit. + (Include): Remove conditionalization. + * modules/mbuiter (Depends-on): Add mbrtowc, mbsinit. + (Include): Remove conditionalization. + * modules/mbfile (Depends-on): Add mbrtowc, mbsinit. + (Include): Remove conditionalization. + * m4/mbiter.m4 (gl_MBITER): Deprecate the use of AC_FUNC_MBRTOWC. + * m4/mbfile.m4 (gl_MBFILE): Likewise. + * NEWS: Mention the change. + Reported by Alan Hourihane <alanh@fairlite.co.uk> + via Sergey Poznyakoff <gray@gnu.org.ua>. + 2008-12-21 Bruno Haible <bruno@clisp.org> * MODULES.html.sh (Extended multibyte and wide character utilities
--- a/NEWS +++ b/NEWS @@ -6,6 +6,13 @@ Date Modules Changes +2008-12-21 mbiter The header files "mbiter.h", "mbuiter.h", + mbuiter "mbfile.h" can now be included without checking + mbfile HAVE_MBRTOWC. The macro HAVE_MBRTOWC will no + longer be defined by these modules in a year. If + you want to continue to use it, you need to invoke + AC_FUNC_MBRTOWC yourself. + 2008-11-11 warnings This module subsumes the file m4/warning.m4 which was removed.
--- a/m4/mbfile.m4 +++ b/m4/mbfile.m4 @@ -1,4 +1,4 @@ -# mbfile.m4 serial 3 +# mbfile.m4 serial 4 dnl Copyright (C) 2005, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,7 @@ [ AC_REQUIRE([AC_TYPE_MBSTATE_T]) dnl The following line is that so the user can test HAVE_MBRTOWC before - dnl #include "mbfile.h". + dnl #include "mbfile.h". It can be removed in 2010. AC_REQUIRE([AC_FUNC_MBRTOWC]) : ])
--- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,4 +1,4 @@ -# mbiter.m4 serial 3 +# mbiter.m4 serial 4 dnl Copyright (C) 2005, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,7 @@ [ AC_REQUIRE([AC_TYPE_MBSTATE_T]) dnl The following line is that so the user can test HAVE_MBRTOWC before - dnl #include "mbiter.h" or "mbuiter.h". + dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010. AC_REQUIRE([AC_FUNC_MBRTOWC]) : ])
--- a/modules/mbfile +++ b/modules/mbfile @@ -8,6 +8,8 @@ Depends-on: mbchar +mbrtowc +mbsinit wchar stdbool @@ -18,9 +20,7 @@ lib_SOURCES += mbfile.h Include: -#if HAVE_MBRTOWC #include "mbfile.h" -#endif License: LGPL