rename MRUBY_OBJECT_HEADER to MRB_OBJECT_HEADER

11 files changed, 15 insertions, 20 deletions

diff --git a/include/mruby/array.h b/include/mruby/array.h
index d0d254936..2857ec75d 100644
--- a/include/mruby/array.h
+++ b/include/mruby/array.h
@@ -18,7 +18,7 @@ struct mrb_shared_array {
 };
 
 struct RArray {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   int len;
   union {
     int capa;
diff --git a/include/mruby/class.h b/include/mruby/class.h
index 0d7f77088..c573bc13e 100644
--- a/include/mruby/class.h
+++ b/include/mruby/class.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 struct RClass {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
   struct kh_mt *mt;
   struct RClass *super;
diff --git a/include/mruby/data.h b/include/mruby/data.h
index 18ca685b1..ad91e0044 100644
--- a/include/mruby/data.h
+++ b/include/mruby/data.h
@@ -17,7 +17,7 @@ struct mrb_data_type {
 };
 
 struct RData {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
   struct mrb_data_type *type;
   void *data;
diff --git a/include/mruby/hash.h b/include/mruby/hash.h
index 85303935c..17a8c0931 100644
--- a/include/mruby/hash.h
+++ b/include/mruby/hash.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 struct RHash {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
   struct kh_ht *ht;
 };
diff --git a/include/mruby/object.h b/include/mruby/object.h
index 8d35b7c5c..afdce5546 100644
--- a/include/mruby/object.h
+++ b/include/mruby/object.h
@@ -7,7 +7,7 @@
 #ifndef MRUBY_OBJECT_H
 #define MRUBY_OBJECT_H
 
-#define MRUBY_OBJECT_HEADER \
+#define MRB_OBJECT_HEADER \
   enum mrb_vtype tt:8;\
   unsigned int color:3;\
   unsigned int flags:21;\
@@ -34,11 +34,11 @@
 #define other_white_part(s) ((s)->current_white_part ^ MRB_GC_WHITES)
 
 struct RBasic {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
 };
 
 struct RObject {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct iv_tbl *iv;
 };
 
diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index 4f9746d1d..1d4fc4a70 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -14,14 +14,14 @@ extern "C" {
 #endif
 
 struct REnv {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   mrb_value *stack;
   mrb_sym mid;
   int cioff;
 };
 
 struct RProc {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   union {
     mrb_irep *irep;
     mrb_func_t func;
diff --git a/include/mruby/range.h b/include/mruby/range.h
index f70aa5668..4f1f3803e 100644
--- a/include/mruby/range.h
+++ b/include/mruby/range.h
@@ -17,7 +17,7 @@ struct mrb_range_edges {
 };
 
 struct RRange {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct mrb_range_edges *edges;
   int excl;
 };
diff --git a/include/mruby/string.h b/include/mruby/string.h
index dac8107e3..cd2c83dcd 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -32,7 +32,7 @@ struct mrb_shared_string {
 };
 
 struct RString {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   int len;
   union {
     int capa;
diff --git a/src/error.h b/src/error.h
index e4d6acb6c..674d4f477 100644
--- a/src/error.h
+++ b/src/error.h
@@ -8,7 +8,7 @@
 #define MRUBY_ERROR_H
 
 struct RException {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
 };
 
 void mrb_sys_fail(mrb_state *mrb, const char *mesg);
diff --git a/src/gc.c b/src/gc.c
index 0b01164d5..e0a923b89 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -77,7 +77,7 @@
 #endif
 
 struct free_obj {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct RBasic *next;
 };
 
diff --git a/src/re.h b/src/re.h
index 91bd1abc1..65ca0e6ae 100644
--- a/src/re.h
+++ b/src/re.h
@@ -31,20 +31,15 @@ struct rmatch {
     struct rmatch_offset *char_offset;
 };
 
-//struct RMatch {
-//  MRUBY_OBJECT_HEADER;
-//  mrb_value str;
-//  struct re_registers *regs;
-//};
 struct RMatch {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct RString *str;
   struct rmatch *rmatch;
   struct RRegexp *regexp;
 };
 
 struct RRegexp {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct re_pattern_buffer *ptr;
   struct RString *src;
   unsigned long usecnt;