Commit 61bfec98 authored by Eli Zaretskii's avatar Eli Zaretskii

Really fix int/EMACS_INT use in bidi.c.

 bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer positions.
 (bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer positions.
parent 145582a0
2010-09-24 Eli Zaretskii <eliz@gnu.org>
* bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer
positions.
(bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer
positions.
* buffer.c (struct sortvec): Use EMACS_INT for buffer positions.
(struct sortstrlist, overlay_str_len): Use EMACS_INT for string
length.
......
......@@ -79,10 +79,10 @@ static Lisp_Object bidi_type_table, bidi_mirror_table;
/* What we need to know about the current paragraph. */
struct bidi_paragraph_info {
int start_bytepos; /* byte position where it begins */
int end_bytepos; /* byte position where it ends */
int embedding_level; /* its basic embedding level */
bidi_dir_t base_dir; /* its base direction */
EMACS_INT start_bytepos; /* byte position where it begins */
EMACS_INT end_bytepos; /* byte position where it ends */
int embedding_level; /* its basic embedding level */
bidi_dir_t base_dir; /* its base direction */
};
/* Data type for describing the bidirectional character categories. */
......@@ -313,7 +313,7 @@ bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
resolved levels in cached states. DIR, if non-zero, means search
in that direction from the last cache hit. */
static INLINE int
bidi_cache_search (int charpos, int level, int dir)
bidi_cache_search (EMACS_INT charpos, int level, int dir)
{
int i, i_start;
......@@ -462,7 +462,7 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
}
static INLINE bidi_type_t
bidi_cache_find (int charpos, int level, struct bidi_it *bidi_it)
bidi_cache_find (EMACS_INT charpos, int level, struct bidi_it *bidi_it)
{
int i = bidi_cache_search (charpos, level, bidi_it->scan_dir);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment