From c1361132bcf4dcd21d93bb51c5a61f9535280420 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 11 Aug 2008 22:00:48 +0000 Subject: [PATCH] * transcode_data.h (rb_transcoder): typedef at first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ transcode_data.h | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cfc8bed4c..15d19a9a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 12 07:00:02 2008 Tanaka Akira + + * transcode_data.h (rb_transcoder): typedef at first. + Tue Aug 12 06:48:35 2008 Tanaka Akira * transcode.c (rb_trans_conv): find second last error. diff --git a/transcode_data.h b/transcode_data.h index f9e9de4aef..1dc7ac8e92 100644 --- a/transcode_data.h +++ b/transcode_data.h @@ -56,10 +56,12 @@ typedef struct byte_lookup { #define TWOTRAIL /* legal but undefined if two more trailing UTF-8 */ #define THREETRAIL /* legal but undefined if three more trailing UTF-8 */ +typedef struct rb_transcoder rb_transcoder; + /* dynamic structure, one per conversion (similar to iconv_t) */ /* may carry conversion state (e.g. for iso-2022-jp) */ typedef struct rb_transcoding { - const struct rb_transcoder *transcoder; + const rb_transcoder *transcoder; int flags; @@ -82,7 +84,7 @@ typedef struct rb_transcoding { (tc)->readbuf.ptr) /* static structure, one per supported encoding pair */ -typedef struct rb_transcoder { +struct rb_transcoder { const char *from_encoding; const char *to_encoding; const BYTE_LOOKUP *conv_tree_start; @@ -94,7 +96,7 @@ typedef struct rb_transcoder { int (*func_io)(rb_transcoding*, VALUE, const unsigned char*); /* info -> output */ int (*func_so)(rb_transcoding*, const unsigned char*, size_t, unsigned char*); /* start -> output */ int (*finish_func)(rb_transcoding*, unsigned char*); /* -> output */ -} rb_transcoder; +}; typedef enum { transcode_invalid_input,