fix 3m-unfriendly shadowing

svn: r2903
This commit is contained in:
Matthew Flatt 2006-05-11 02:14:47 +00:00
parent bbdbec15d5
commit 0d0a34d4ca

View File

@ -4207,12 +4207,12 @@ static Scheme_Object *convert_one(const char *who, int opos, int argc, Scheme_Ob
if (c->kind == mzUTF16_TO_UTF8_KIND) { if (c->kind == mzUTF16_TO_UTF8_KIND) {
if (istart & 0x1) { if (istart & 0x1) {
/* Copy to word-align */ /* Copy to word-align */
char *c; char *c2;
c = (char *)scheme_malloc_atomic(ifinish - istart); c2 = (char *)scheme_malloc_atomic(ifinish - istart);
memcpy(c, instr XFORM_OK_PLUS istart, ifinish - istart); memcpy(c, instr XFORM_OK_PLUS istart, ifinish - istart);
ifinish = ifinish - istart; ifinish = ifinish - istart;
istart = 0; istart = 0;
instr = c; instr = c2;
} }
status = utf8_encode_x((const unsigned int *)instr, istart >> 1, ifinish >> 1, status = utf8_encode_x((const unsigned int *)instr, istart >> 1, ifinish >> 1,