summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mrbconf.h2
-rw-r--r--include/mruby.h2
-rw-r--r--include/mruby/dump.h2
-rw-r--r--include/mruby/error.h1
-rw-r--r--include/mruby/khash.h2
5 files changed, 6 insertions, 3 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h
index bcef1b1bd..c84b32cd8 100644
--- a/include/mrbconf.h
+++ b/include/mrbconf.h
@@ -24,7 +24,7 @@
//#define MRB_ENDIAN_BIG
/* represent mrb_value as a word (natural unit of data for the processor) */
-// #define MRB_WORD_BOXING
+//#define MRB_WORD_BOXING
/* argv max size in mrb_funcall */
//#define MRB_FUNCALL_ARGC_MAX 16
diff --git a/include/mruby.h b/include/mruby.h
index 3b1425cce..c1f45bf0b 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -422,6 +422,8 @@ void* mrb_alloca(mrb_state *mrb, size_t);
#define mrb_assert_int_fit(t1,n,t2,max) ((void)0)
#endif
+mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
+
#if defined(__cplusplus)
} /* extern "C" { */
#endif
diff --git a/include/mruby/dump.h b/include/mruby/dump.h
index 1b691ea1a..fc79f1f4b 100644
--- a/include/mruby/dump.h
+++ b/include/mruby/dump.h
@@ -94,6 +94,8 @@ struct rite_section_lv_header {
RITE_SECTION_HEADER;
};
+#define RITE_LV_NULL_MARK UINT16_MAX
+
struct rite_binary_footer {
RITE_SECTION_HEADER;
};
diff --git a/include/mruby/error.h b/include/mruby/error.h
index 9dd4260c2..7ae2d4348 100644
--- a/include/mruby/error.h
+++ b/include/mruby/error.h
@@ -15,7 +15,6 @@ void mrb_sys_fail(mrb_state *mrb, const char *mesg);
mrb_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
mrb_value mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv);
-mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
void mrb_print_backtrace(mrb_state *mrb);
mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
diff --git a/include/mruby/khash.h b/include/mruby/khash.h
index d2e87b8dd..d2501dd52 100644
--- a/include/mruby/khash.h
+++ b/include/mruby/khash.h
@@ -112,7 +112,7 @@ kh_fill_flags(uint8_t *p, uint8_t c, size_t len)
kh_alloc_##name(mrb, h); \
return h; \
} \
- kh_##name##_t *kh_init_##name(mrb_state *mrb){ \
+ kh_##name##_t *kh_init_##name(mrb_state *mrb) { \
return kh_init_##name##_size(mrb, KHASH_DEFAULT_SIZE); \
} \
void kh_destroy_##name(mrb_state *mrb, kh_##name##_t *h) \