aboutsummaryrefslogtreecommitdiffstats
path: root/src/textprop.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/textprop.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/textprop.c')
-rw-r--r--src/textprop.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c
index a0d7d2689c4..d9da36bf36b 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -514,7 +514,7 @@ erase_properties (INTERVAL i)
514 POSITION is BEG-based. */ 514 POSITION is BEG-based. */
515 515
516INTERVAL 516INTERVAL
517interval_of (int position, Lisp_Object object) 517interval_of (EMACS_INT position, Lisp_Object object)
518{ 518{
519 register INTERVAL i; 519 register INTERVAL i;
520 EMACS_INT beg, end; 520 EMACS_INT beg, end;
@@ -2012,7 +2012,8 @@ call_mod_hooks (Lisp_Object list, Lisp_Object start, Lisp_Object end)
2012 those hooks in order, with START and END - 1 as arguments. */ 2012 those hooks in order, with START and END - 1 as arguments. */
2013 2013
2014void 2014void
2015verify_interval_modification (struct buffer *buf, int start, int end) 2015verify_interval_modification (struct buffer *buf,
2016 EMACS_INT start, EMACS_INT end)
2016{ 2017{
2017 register INTERVAL intervals = BUF_INTERVALS (buf); 2018 register INTERVAL intervals = BUF_INTERVALS (buf);
2018 register INTERVAL i; 2019 register INTERVAL i;