Merge back changes from the Ruby version

Mostly a few portability bits, but a few httpd UI/UX
tweaks as well.

1 files changed, 2 insertions, 0 deletions

diff --git a/mymalloc.h b/mymalloc.h
index 6b5a22d..196ccc0 100644
--- a/mymalloc.h
+++ b/mymalloc.h
@@ -100,6 +100,8 @@ static void *my_mmap(size_t size)
 #endif
 #include "dlmalloc_c.h"
 #undef ABORT /* conflicts with Perl */
+#undef NOINLINE /* conflicts with Ruby, defined by dlmalloc_c.h */
+#undef HAVE_MREMAP /* conflicts with Ruby 3.2 */
 
 static MWRAP_TSD mstate ms_tsd;