summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--transcode.c19
2 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index fe67dc7f8..cde0ed64a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 14 01:53:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * transcode.c (transcode_restartable0): can't build with VC9.
+
Sun Jun 14 01:23:41 2009 Tadayoshi Funaba <tadf@dotrb.org>
* rational.c (nurat_to_f): use fdiv.
diff --git a/transcode.c b/transcode.c
index 7d2d115cb..b1d1773ce 100644
--- a/transcode.c
+++ b/transcode.c
@@ -540,15 +540,16 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
follow_info:
switch (next_info & 0x1F) {
case NOMAP:
- {
- const unsigned char *pend = in_p;
- in_p = inchar_start;
- while (in_p < pend) {
- next_byte = (unsigned char)*in_p++;
- SUSPEND_OBUF(3); *out_p++ = next_byte;
- }
- }
- continue;
+ {
+ const unsigned char *char_start;
+ size_t char_len, i = 0;
+ char_start = transcode_char_start(tc, *in_pos, inchar_start, in_p, &char_len);
+ while (i < char_len) {
+ SUSPEND_OBUF(3);
+ *out_p++ = char_start[i++];
+ }
+ }
+ continue;
case 0x00: case 0x04: case 0x08: case 0x0C:
case 0x10: case 0x14: case 0x18: case 0x1C:
SUSPEND_AFTER_OUTPUT(25);