From faf8b5bc19513bc7612103648a98a37629607f2e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 23 Sep 2010 22:57:48 +0200 Subject: [PATCH] Cast SPECPDL_INDEX to int, and do further EMACS_INT/int cleanups. --- src/ChangeLog | 5 +++++ src/editfns.c | 8 ++++---- src/lisp.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 233a521f027..98fe7d466b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2010-09-23 Lars Magne Ingebrigtsen + * lisp.h (SPECPDL_INDEX): Cast to int, since we're not going to + unwind_protect more than 2GB worth of functions. + + * editfns.c (Finsert_char): EMACS_INT/int cleanup. + * lisp.h: Have oblookup take EMACS_INT to allow interning big string and avoid compiler warnings. (USE_SAFE_ALLOCA): Cast to int to avoid compilation warnings in diff --git a/src/editfns.c b/src/editfns.c index f7240e99190..f76beb5e678 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2270,7 +2270,7 @@ from adjoining text, if those properties are sticky. */) (Lisp_Object character, Lisp_Object count, Lisp_Object inherit) { register unsigned char *string; - register int strlen; + register EMACS_INT strlen; register int i; register EMACS_INT n; int len; @@ -2955,7 +2955,7 @@ It returns the number of characters changed. */) register unsigned char *tt; /* Trans table. */ register int nc; /* New character. */ int cnt; /* Number of changes made. */ - int size; /* Size of translate table. */ + EMACS_INT size; /* Size of translate table. */ EMACS_INT pos, pos_byte, end_pos; int multibyte = !NILP (current_buffer->enable_multibyte_characters); int string_multibyte; @@ -3026,7 +3026,7 @@ It returns the number of characters changed. */) } else { - int c; + EMACS_INT c; nc = oc; val = CHAR_TABLE_REF (table, oc); @@ -3239,7 +3239,7 @@ save_restriction_restore (Lisp_Object data) /* The restriction has changed from the saved one, so restore the saved restriction. */ { - int pt = BUF_PT (buf); + EMACS_INT pt = BUF_PT (buf); SET_BUF_BEGV_BOTH (buf, beg->charpos, beg->bytepos); SET_BUF_ZV_BOTH (buf, end->charpos, end->bytepos); diff --git a/src/lisp.h b/src/lisp.h index bbc97241ef1..4baa72f4435 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1881,7 +1881,7 @@ extern int specpdl_size; extern EMACS_INT max_specpdl_size; -#define SPECPDL_INDEX() (specpdl_ptr - specpdl) +#define SPECPDL_INDEX() ((int) (specpdl_ptr - specpdl)) /* Everything needed to describe an active condition case. */ struct handler -- 2.39.5