resolve conflict

2 files changed, 2 insertions, 11 deletions

diff --git a/include/mruby/irep.h b/include/mruby/irep.h
index 1b978dd42..480cb052f 100644
--- a/include/mruby/irep.h
+++ b/include/mruby/irep.h
@@ -26,17 +26,7 @@ typedef struct mrb_irep {
   uint8_t flags;
 
   mrb_code *iseq;
-  struct irep_pool {
-    union {
-      mrb_float f;
-      struct irep_pool_string {
-        mrb_int len;
-        char buf[1];
-      } *s;
-      mrb_int i;
-    } value;
-    enum irep_pool_type type;
-  } *pool;
+  mrb_value *pool;
   mrb_sym *syms;
   struct mrb_irep **reps;
 
diff --git a/include/mruby/string.h b/include/mruby/string.h
index 727d95677..77ff7a3d6 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -50,6 +50,7 @@ char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr);
 char *mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr);
 int mrb_str_offset(mrb_state *mrb, mrb_value str, int pos);
 mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str);
+mrb_value mrb_str_dup_static(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
 mrb_value mrb_str_cat_cstr(mrb_state *, mrb_value, const char *);
 mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, int base, int badcheck);