From 68b208d80c04c2bb08ba21ff7a7d5796d097a088 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 19 Dec 2008 02:58:16 +0100 Subject: [PATCH] Ensure wchar.h is replaced when needed. --- ChangeLog | 5 +++++ m4/btowc.m4 | 3 ++- m4/mbsinit.m4 | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc16a03f2..e9eebfe63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-18 Bruno Haible + + * m4/mbsinit.m4 (gl_FUNC_MBSINIT): Invoke gl_REPLACE_WCHAR_H. + * m4/btowc.m4 (gl_FUNC_BTOWC): Likewise. + 2008-12-18 Simon Josefsson * lib/flock.c: Use proper #if symbol in check. Reported by "Tom diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 98849d65a..a53694acd 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,4 +1,4 @@ -# btowc.m4 serial 1 +# btowc.m4 serial 2 dnl Copyright (C) 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,6 +11,7 @@ AC_DEFUN([gl_FUNC_BTOWC], AC_CHECK_FUNCS_ONCE([btowc]) if test $ac_cv_func_btowc = no; then HAVE_BTOWC=0 + gl_REPLACE_WCHAR_H AC_LIBOBJ([btowc]) gl_PREREQ_BTOWC fi diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index 8c9542a29..d7d547541 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,4 +1,4 @@ -# mbsinit.m4 serial 1 +# mbsinit.m4 serial 2 dnl Copyright (C) 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, @@ -12,6 +12,7 @@ AC_DEFUN([gl_FUNC_MBSINIT], AC_CHECK_FUNCS_ONCE([mbsinit]) if test $ac_cv_func_mbsinit = no; then HAVE_MBSINIT=0 + gl_REPLACE_WCHAR_H AC_LIBOBJ([mbsinit]) gl_PREREQ_MBSINIT fi -- 2.11.0