aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-05 05:16:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-05 05:16:46 +0000
commit6ab08d2e8dd0c382d41e477f8255d7d6e4e67d9b (patch)
treeeb5005287a495637cb849619d43dd717e0bcb4ad /st.c
parent3105141c7d7a02af9b724dfa6374f4579a9eff02 (diff)
downloadruby-6ab08d2e8dd0c382d41e477f8255d7d6e4e67d9b.tar.gz
configure.in, missing.h: jemalloc mangling
* configure.in (with-jemalloc): also check for header, for ABIs which JEMALLOC_MANGLE is needed, i.e., Mach-O and PE-COFF platforms. [ruby-core:62939] [Feature #9113] * include/ruby/missing.h: include alternative malloc header to replace memory management functions. * dln.c, io.c, parse.y, st.c: undef malloc family before re-definition to suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'st.c')
-rw-r--r--st.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/st.c b/st.c
index ff5bb305ab..f26443f99c 100644
--- a/st.c
+++ b/st.c
@@ -73,6 +73,10 @@ static const struct st_hash_type type_strcasehash = {
static void rehash(st_table *);
#ifdef RUBY
+#undef malloc
+#undef realloc
+#undef calloc
+#undef free
#define malloc xmalloc
#define calloc xcalloc
#define realloc xrealloc