diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-27 00:52:24 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-27 00:52:24 +0900 |
| commit | a0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d (patch) | |
| tree | 5c2c21a850129b3d596034d81bcdf063613305a4 /test | |
| parent | 1abe678e1c0a5fd153c07d71634f262fd51b7668 (diff) | |
| parent | 974febd315a6520184f95cb50a7c2b46e4582002 (diff) | |
| download | mruby-a0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d.tar.gz mruby-a0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d.zip | |
resolve conflict from #964
Diffstat (limited to 'test')
| -rw-r--r-- | test/init_mrbtest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/init_mrbtest.c b/test/init_mrbtest.c index 973029c8f..5c80c6e91 100644 --- a/test/init_mrbtest.c +++ b/test/init_mrbtest.c @@ -5,7 +5,7 @@ #include "mruby/string.h" #include "mruby/proc.h" -extern const char mrbtest_irep[]; +extern const uint8_t mrbtest_irep[]; void mrbgemtest_init(mrb_state* mrb); |