From 14af5f7fc4d7557ee712d3b6a8b46d9034c2ff39 Mon Sep 17 00:00:00 2001
From: Chong Yidong
Date: Wed, 25 Jan 2012 13:55:01 +0800
Subject: Merge from emacs-23 branch

---
 src/coding.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/coding.c')

diff --git a/src/coding.c b/src/coding.c
index 5c3048f95e8..15e8572edb3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -855,7 +855,7 @@ static void coding_alloc_by_making_gap (struct coding_system *,
 static unsigned char *alloc_destination (struct coding_system *,
                                          EMACS_INT, unsigned char *);
 static void setup_iso_safe_charsets (Lisp_Object);
-static int encode_designation_at_bol (struct coding_system *,
+static EMACS_INT encode_designation_at_bol (struct coding_system *,
 				      int *, int *, unsigned char *);
 static int detect_eol (const unsigned char *,
                        EMACS_INT, enum coding_category);
@@ -4351,7 +4351,7 @@ encode_invocation_designation (struct charset *charset,
    If the current block ends before any end-of-line, we may fail to
    find all the necessary designations.  */
 
-static int
+static EMACS_INT
 encode_designation_at_bol (struct coding_system *coding,
 			   int *charbuf, int *charbuf_end,
 			   unsigned char *dst)
-- 
cgit v1.2.1