diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
| commit | 0b4f33213729a87e146d990604330c70896dac07 (patch) | |
| tree | ab1a1d05bac250042f3dfe040ee21d89c162ac21 /src/load.c | |
| parent | b2e6a0fc04f6237f5118bf6c2f404a0d8fa4d2c4 (diff) | |
| parent | f06eceaa1965794fd2ba9910c83b4e0459550a21 (diff) | |
| download | mruby-0b4f33213729a87e146d990604330c70896dac07.tar.gz mruby-0b4f33213729a87e146d990604330c70896dac07.zip | |
merge conflict resolution
Diffstat (limited to 'src/load.c')
| -rw-r--r-- | src/load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/load.c b/src/load.c index c0684f1aa..1b607909c 100644 --- a/src/load.c +++ b/src/load.c @@ -477,7 +477,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, mrb_irep *irep, uint32 memcpy(buf, src, snl); //symbol name src += snl; buf[snl] = '\0'; - irep->syms[i] = mrb_intern(mrb, buf); + irep->syms[i] = mrb_intern2(mrb, buf, snl); } } crc = calc_crc_16_ccitt((unsigned char*)pStart, src - pStart); //Calculate CRC |