From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 Jul 2011 16:23:49 +0000 (+0300)
Subject: src/bidi.c: Fix type of a variable revealed on x86_64.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66ff7ddf932697fc7d114ae6f0602fb57ec28eda;p=emacs.git

src/bidi.c: Fix type of a variable revealed on x86_64.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7dc419ef731..e59c72643d4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-09  Eli Zaretskii  <eliz@gnu.org>
 
+	* bidi.c (bidi_fetch_char): Fix the type of `len' according to
+	what STRING_CHAR_AND_LENGTH expects.
+
 	* xdisp.c (move_it_in_display_line_to): Record prev_method and
 	prev_pos immediately before the call to set_iterator_to_next.
 	Fixes cursor motion in bidi-reordered lines with stretch glyphs
diff --git a/src/bidi.c b/src/bidi.c
index 5b26ecf0854..a25e2489547 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -922,7 +922,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
     {
       if (string->s)
 	{
-	  EMACS_INT len;
+	  int len;
 
 	  if (!string->unibyte)
 	    {
@@ -937,7 +937,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
 	}
       else if (STRINGP (string->lstring))
 	{
-	  EMACS_INT len;
+	  int len;
 
 	  if (!string->unibyte)
 	    {