diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | m4/mbfile.m4 | 4 | ||||
| -rw-r--r-- | m4/mbiter.m4 | 4 | ||||
| -rw-r--r-- | modules/mbfile | 4 | ||||
| -rw-r--r-- | modules/mbiter | 4 | ||||
| -rw-r--r-- | modules/mbuiter | 4 |
7 files changed, 32 insertions, 10 deletions
@@ -1,5 +1,20 @@ 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 <wchar.h>): Add btowc, wctob, mbsinit, mbrlen, mbrtowc, mbsrtowcs, wcrtomb, wcsrtombs. @@ -6,6 +6,13 @@ User visible incompatible changes 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. diff --git a/m4/mbfile.m4 b/m4/mbfile.m4 index d2fc3c4542..ec862a8613 100644 --- 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_DEFUN([gl_MBFILE], [ 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]) : ]) diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 828376878e..88ba569403 100644 --- 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_DEFUN([gl_MBITER], [ 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]) : ]) diff --git a/modules/mbfile b/modules/mbfile index d6787b41c1..1d2f5156cf 100644 --- a/modules/mbfile +++ b/modules/mbfile @@ -8,6 +8,8 @@ m4/mbrtowc.m4 Depends-on: mbchar +mbrtowc +mbsinit wchar stdbool @@ -18,9 +20,7 @@ Makefile.am: lib_SOURCES += mbfile.h Include: -#if HAVE_MBRTOWC #include "mbfile.h" -#endif License: LGPL diff --git a/modules/mbiter b/modules/mbiter index 427cbe104d..af55076e11 100644 --- a/modules/mbiter +++ b/modules/mbiter @@ -8,6 +8,8 @@ m4/mbrtowc.m4 Depends-on: mbchar +mbrtowc +mbsinit wchar stdbool @@ -18,9 +20,7 @@ Makefile.am: lib_SOURCES += mbiter.h Include: -#if HAVE_MBRTOWC #include "mbiter.h" -#endif License: LGPL diff --git a/modules/mbuiter b/modules/mbuiter index fbcabe3cf3..b828e643e8 100644 --- a/modules/mbuiter +++ b/modules/mbuiter @@ -8,6 +8,8 @@ m4/mbrtowc.m4 Depends-on: mbchar +mbrtowc +mbsinit wchar stdbool strnlen1 @@ -19,9 +21,7 @@ Makefile.am: lib_SOURCES += mbuiter.h Include: -#if HAVE_MBRTOWC #include "mbuiter.h" -#endif License: LGPL |