(file::get_counts)[!HAVE_MBRTOWC]: Bugfix,

do not invoke mbrtowc.

diff --git a/ChangeLog b/ChangeLog
index b997bb2cdb006f240a54c6c1a11c5dcfb52ab6a9..bd4b1b9ff3649411e1fd951029906f3fed68ff28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/source-file.cc (file::get_counts)[!HAVE_MBRTOWC]: Bugfix,
+       do not invoke mbrtowc.
+
        * lily/relocate.cc (setup_paths): Add more debugging verbosity.
 
 2006-01-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 2fdeb9fd280f6fb8485ac25bf1a386c81c83ba01..4acdfd6ecf291962b28c52d68c69ab82a8a8d139 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -269,7 +269,11 @@ Source_file::get_counts (char const *pos_str0,
       /*
        FIXME, this is apparently locale dependent.
       */
+#if HAVE_MBRTOWC
       size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
+#else
+      size_t thislen = 1;
+#endif /* !HAVE_MBRTOWC */
 
       /* Stop converting at invalid character;
         this can mean we have read just the first part