From: Alan Hourihane <alanh@fairlite.co.uk>
To: gentoo-alt <gentoo-alt@lists.gentoo.org>
Subject: [gentoo-alt] texinfo 4.13 patch
Date: Thu, 20 Nov 2008 10:55:58 +0000 [thread overview]
Message-ID: <1227178558.13985.251.camel@jetpack.demon.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 59 bytes --]
This patch fixes a build problem with texinfo 4.13.
Alan.
[-- Attachment #2: texinfo-4.13-mint.patch --]
[-- Type: text/x-patch, Size: 1454 bytes --]
diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h
--- gnulib/lib/mbiter.h 2008-05-12 12:38:21.000000000 +0000
+++ gnulib/lib/mbiter.h 2008-11-19 21:13:17.000000000 +0000
@@ -117,8 +117,10 @@
{
if (iter->next_done)
return;
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
if (iter->in_shift)
goto with_shift;
+#endif
/* Handle most ASCII characters quickly, without calling mbrtowc(). */
if (is_basic (*iter->cur.ptr))
{
@@ -129,6 +131,7 @@
iter->cur.wc = *iter->cur.ptr;
iter->cur.wc_valid = true;
}
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
else
{
assert (mbsinit (&iter->state));
@@ -169,6 +172,7 @@
iter->in_shift = false;
}
}
+#endif
iter->next_done = true;
}
diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h
--- gnulib/lib/mbuiter.h 2007-12-25 23:57:18.000000000 +0000
+++ gnulib/lib/mbuiter.h 2008-11-19 21:15:12.000000000 +0000
@@ -125,8 +125,10 @@
{
if (iter->next_done)
return;
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
if (iter->in_shift)
goto with_shift;
+#endif
/* Handle most ASCII characters quickly, without calling mbrtowc(). */
if (is_basic (*iter->cur.ptr))
{
@@ -137,6 +139,7 @@
iter->cur.wc = *iter->cur.ptr;
iter->cur.wc_valid = true;
}
+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
else
{
assert (mbsinit (&iter->state));
@@ -178,6 +181,7 @@
iter->in_shift = false;
}
}
+#endif
iter->next_done = true;
}
next reply other threads:[~2008-11-20 10:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-20 10:55 Alan Hourihane [this message]
2008-11-24 16:57 ` [gentoo-alt] texinfo 4.13 patch Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1227178558.13985.251.camel@jetpack.demon.co.uk \
--to=alanh@fairlite.co.uk \
--cc=gentoo-alt@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox