Fix last changes in editfns.c and intervals.c.

 editfns.c (clip_to_bounds): Return an EMACS_INT value.
 lisp.h (clip_to_bounds): Adjust prototype.
 intervals.c (adjust_for_invis_intang): Return EMACS_INT value.

src/ChangeLog

+2010-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* editfns.c (clip_to_bounds): Return an EMACS_INT value.
+
+	* lisp.h (clip_to_bounds): Adjust prototype.
+
+	* intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
+
 2010-09-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 	* lisp.h: Change the definition of all marker.c functions that

src/editfns.c

@@ -272,7 +272,7 @@ DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0,
   return buildmark (PT, PT_BYTE);
 }
 
-int
+EMACS_INT
 clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper)
 {
   if (num < lower)

src/intervals.c

@@ -1926,7 +1926,7 @@ set_point (EMACS_INT charpos)
    Note that `stickiness' is determined by overlay marker insertion types,
    if the invisible property comes from an overlay.  */
 
-static int
+static EMACS_INT
 adjust_for_invis_intang (EMACS_INT pos, EMACS_INT test_offs, EMACS_INT adj,
 			 int test_intang)
 {

src/lisp.h

@@ -2991,7 +2991,7 @@ EXFUN (Fwiden, 0);
 EXFUN (Fuser_login_name, 1);
 EXFUN (Fsystem_name, 0);
 EXFUN (Fcurrent_time, 0);
-extern int clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT);
+extern EMACS_INT clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT);
 extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int);
 extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT,
 					    EMACS_INT, int);