aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.c
diff options
context:
space:
mode:
authorEli Zaretskii2011-04-16 21:26:30 +0300
committerEli Zaretskii2011-04-16 21:26:30 +0300
commitd1dfb56cc84a6d70262d979face230a71e98d479 (patch)
tree8204edb64962a875b368dd248c00e127f9584b73 /src/intervals.c
parent10472dd0d62d986e048c01a3d37627b843a321d2 (diff)
downloademacs-d1dfb56cc84a6d70262d979face230a71e98d479.tar.gz
emacs-d1dfb56cc84a6d70262d979face230a71e98d479.zip
Fix regex.c, syntax.c and friends for buffers > 2GB.
src/syntax.h (struct gl_state_s): Declare character position members EMACS_INT. src/syntax.c (update_syntax_table): Declare 2nd argument EMACS_INT. src/textprop.c (verify_interval_modification, interval_of): Declare arguments EMACS_INT. src/intervals.c (adjust_intervals_for_insertion): Declare arguments EMACS_INT. src/intervals.h (CHECK_TOTAL_LENGTH): Cast to EMACS_INT, not `int'. src/indent.c (Fvertical_motion): Local variable it_start is now EMACS_INT. src/regex.c (re_match, re_match_2, re_match_2_internal) (bcmp_translate, regcomp, regexec, print_double_string) (group_in_compile_stack, re_search, re_search_2, regex_compile) (re_compile_pattern, re_exec): Declare arguments and local variables `size_t' and `ssize_t' and return values `regoff_t', as appropriate. (POP_FAILURE_REG_OR_COUNT) <pfreg>: Declare `long'. (CHECK_INFINITE_LOOP) <failure>: Declare `ssize_t'. <compile_stack_type>: `size' and `avail' are now `size_t'. src/regex.h <regoff_t>: Use ssize_t, not int. (re_search, re_search_2, re_match, re_match_2): Arguments that specify buffer/string position and length are now ssize_t and size_t. Return type is regoff_t.
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 3be6e2d1ffa..7ce1796d8eb 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -805,9 +805,9 @@ update_interval (register INTERVAL i, EMACS_INT pos)
805static INTERVAL 805static INTERVAL
806adjust_intervals_for_insertion (tree, position, length) 806adjust_intervals_for_insertion (tree, position, length)
807 INTERVAL tree; 807 INTERVAL tree;
808 int position, length; 808 EMACS_INT position, length;
809{ 809{
810 register int relative_position; 810 register EMACS_INT relative_position;
811 register INTERVAL this; 811 register INTERVAL this;
812 812
813 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */ 813 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */