summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2021-08-07 06:48:03 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2021-08-07 06:48:03 +0900
commitcd02cef465c12e111a308f87ee899d91774440db (patch)
treec8f00034e06d4eeb38eba0765f20bd31da24b17b
parentce0b38fb720eae757464a6abd0cdca6f74895857 (diff)
downloadmruby-cd02cef465c12e111a308f87ee899d91774440db.tar.gz
mruby-cd02cef465c12e111a308f87ee899d91774440db.zip
array.h: avoid duplicated defined of `MRB_ARY_NO_EMBED`; fix #5520
-rw-r--r--include/mruby/array.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h
index 105e825ea..e8a003e47 100644
--- a/include/mruby/array.h
+++ b/include/mruby/array.h
@@ -14,15 +14,17 @@
*/
MRB_BEGIN_DECL
-
typedef struct mrb_shared_array {
int refcnt;
mrb_ssize len;
mrb_value *ptr;
} mrb_shared_array;
-#if defined(MRB_32BIT) && defined(MRB_NO_BOXING) && !defined(MRB_USE_FLOAT32)
+#if defined(MRB_32BIT) && defined(MRB_NO_BOXING) && !defined(MRB_USE_FLOAT32) && !defined(MRB_ARY_NO_EMBED)
# define MRB_ARY_NO_EMBED
+#endif
+
+#ifdef MRB_ARY_NO_EMBED
# define MRB_ARY_EMBED_LEN_MAX 0
#else
# define MRB_ARY_EMBED_LEN_MAX ((mrb_int)(sizeof(void*)*3/sizeof(mrb_value)))