diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-05 05:16:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-05 05:16:46 +0000 |
| commit | 6ab08d2e8dd0c382d41e477f8255d7d6e4e67d9b (patch) | |
| tree | eb5005287a495637cb849619d43dd717e0bcb4ad /include/ruby | |
| parent | 3105141c7d7a02af9b724dfa6374f4579a9eff02 (diff) | |
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 'include/ruby')
| -rw-r--r-- | include/ruby/missing.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 53e0833814..161d95430a 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -21,6 +21,9 @@ extern "C" { #include "ruby/config.h" #include <stddef.h> #include <math.h> /* for INFINITY and NAN */ +#ifdef RUBY_ALTERNATIVE_MALLOC_HEADER +# include RUBY_ALTERNATIVE_MALLOC_HEADER +#endif #ifdef RUBY_EXTCONF_H #include RUBY_EXTCONF_H #endif |