* intervals.h (struct interval): Use EMACS_INT for members

where EMACS_UINT might cause problems.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html>.
(CHECK_TOTAL_LENGTH): Remove cast to EMACS_INT; no longer needed.
* intervals.c (interval_deletion_adjustment): Now returns EMACS_INT.
All uses changed.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/intervals.h b/src/intervals.h
index 6cf5c89374b..720598fe7a6 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -27,8 +27,8 @@ struct interval
 {
   /* The first group of entries deal with the tree structure.  */
 
-  EMACS_UINT total_length;      /* Length of myself and both children.  */
-  EMACS_UINT position;          /* Cache of interval's character position.  */
+  EMACS_INT total_length;       /* Length of myself and both children.  */
+  EMACS_INT position;           /* Cache of interval's character position.  */
                                 /* This field is usually updated
                                    simultaneously with an interval
                                    traversal, there is no guarantee
@@ -164,7 +164,7 @@ struct interval
 #define CHECK_TOTAL_LENGTH(i)                \
   do                                         \
     {                                        \
-      if ((EMACS_INT) (i)->total_length < 0) \
+      if ((i)->total_length < 0)             \
         abort ();                            \
     }                                        \
   while (0)