$NetBSD: patch-gnulib_lib_mbuiter.h,v 1.2 2013/07/04 16:19:16 wiz Exp $

* http://savannah.gnu.org/bugs/?24687

--- gnulib/lib/mbuiter.h.orig	2013-02-19 22:25:29.000000000 +0000
+++ gnulib/lib/mbuiter.h
@@ -130,8 +130,10 @@ mbuiter_multi_next (struct mbuiter_multi
 {
   if (iter->next_done)
     return;
+#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC)
   if (iter->in_shift)
     goto with_shift;
+#endif
   /* Handle most ASCII characters quickly, without calling mbrtowc().  */
   if (is_basic (*iter->cur.ptr))
     {
@@ -142,6 +144,7 @@ mbuiter_multi_next (struct mbuiter_multi
       iter->cur.wc = *iter->cur.ptr;
       iter->cur.wc_valid = true;
     }
+#if defined(HAVE_MBSINIT) && defined(HAVE_MBRTOWC)
   else
     {
       assert (mbsinit (&iter->state));
@@ -183,6 +186,7 @@ mbuiter_multi_next (struct mbuiter_multi
             iter->in_shift = false;
         }
     }
+#endif
   iter->next_done = true;
 }