diff --git a/ChangeLog b/ChangeLog
index b52baea775..1d51861d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 15 11:11:04 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode_data.h (rb_transcoder): resetsize_func and resetstate_func
+	  also returns ssize_t.
+
+	* enc/trans/iso2022.trans: follow the type change.
+
 Mon Sep 15 10:28:10 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* test/matrix/test_matrix.rb (setup): typo.
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index fe9a9b820e..7dc2c19e37 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -163,7 +163,7 @@ fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigne
     return o - output0;
 }
 
-static int
+static ssize_t
 iso2022jp_encoder_reset_sequence_size(void *statep)
 {
     unsigned char *sp = statep;
diff --git a/transcode_data.h b/transcode_data.h
index ab9a1019b5..5566e7b2d0 100644
--- a/transcode_data.h
+++ b/transcode_data.h
@@ -87,8 +87,8 @@ struct rb_transcoder {
     ssize_t (*func_io)(void*, VALUE, const unsigned char*, size_t); /* info  -> output */
     ssize_t (*func_so)(void*, const unsigned char*, size_t, unsigned char*, size_t); /* start -> output */
     ssize_t (*finish_func)(void*, unsigned char*, size_t); /* -> output */
-    int (*resetsize_func)(void*); /* -> len */
-    int (*resetstate_func)(void*, unsigned char*, size_t); /* -> output */
+    ssize_t (*resetsize_func)(void*); /* -> len */
+    ssize_t (*resetstate_func)(void*, unsigned char*, size_t); /* -> output */
 };
 
 void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);