summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtkoba <69125751+xtkoba@users.noreply.github.com>2021-04-30 21:35:15 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-05-01 11:04:17 +0900
commit121fa24a3451b45c41ac0a661b64e9fc8600e589 (patch)
tree1b2371df7d9eea40cd94bb4d93f1af4fb1b31a29
parentf64d7674f6c03834754ec92054300eae7bac3015 (diff)
Adjust struct member offset for i386 Cygwin
Fixes [Bug #17606]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4437
-rw-r--r--vm_core.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/vm_core.h b/vm_core.h
index 31ac4ace76..f21d85032c 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -218,6 +218,10 @@ struct rb_control_frame_struct;
/* iseq data type */
typedef struct rb_compile_option_struct rb_compile_option_t;
+#if (SIZEOF_SERIAL_T > SIZEOF_VOIDP) && defined(__CYGWIN__)
+#pragma pack(push, 4) /* == SIZEOF_VOIDP */
+#endif
+
// imemo_constcache
struct iseq_inline_constant_cache_entry {
VALUE flags;
@@ -228,6 +232,10 @@ struct iseq_inline_constant_cache_entry {
// v3
};
+#if (SIZEOF_SERIAL_T > SIZEOF_VOIDP) && defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
+
struct iseq_inline_constant_cache {
struct iseq_inline_constant_cache_entry *entry;
};