From d1178ec8ebbcc07289aa0a13c435a13406eb33ba Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 1 Jan 2026 10:23:21 +0900 Subject: [PATCH] hash.c, symbol.c, string.c, mruby-string-ext: undef lesser macro Add #undef lesser after last usage to prevent macro redefinition warnings when files are amalgamated into a single translation unit. Co-authored-by: Claude --- mrbgems/mruby-string-ext/src/string.c | 1 + src/hash.c | 1 + src/string.c | 1 + src/symbol.c | 1 + 4 files changed, 4 insertions(+) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 45398b393..f58a165b2 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -1226,6 +1226,7 @@ str_casecmp(mrb_state *mrb, mrb_value self) if (len1 > len2) return mrb_fixnum_value(1); return mrb_fixnum_value(-1); } +#undef lesser /* * call-seq: diff --git a/src/hash.c b/src/hash.c index f39577af7..8f0f40f0c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -2281,3 +2281,4 @@ mrb_init_hash(mrb_state *mrb) mrb_define_method_id(mrb, h, MRB_SYM(__merge), mrb_hash_merge_m, MRB_ARGS_REQ(1)); mrb_define_method_id(mrb, h, MRB_SYM(__compact), mrb_hash_compact, MRB_ARGS_NONE()); /* implementation of Hash#compact! */ } +#undef lesser diff --git a/src/string.c b/src/string.c index 0b5ed3bb1..a0dee0f85 100644 --- a/src/string.c +++ b/src/string.c @@ -1257,6 +1257,7 @@ mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2) if (retval > 0) return 1; return -1; } +#undef lesser /* 15.2.10.5.3 */ diff --git a/src/symbol.c b/src/symbol.c index 616a40de5..04d00d260 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -977,6 +977,7 @@ sym_cmp(mrb_state *mrb, mrb_value s1) return mrb_fixnum_value(-1); } } +#undef lesser void mrb_init_symbol(mrb_state *mrb)