diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-22 00:05:34 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-22 00:05:34 +0000 |
commit | 215a7da2a6584295ff9bfaa5e0c4de051d831d2c (patch) | |
tree | f05cd31de98bd9de498c6330ff9c412615a6d7ef | |
parent | 62d6fc31c7b8d55cdb690833d2cebda6f2e3c136 (diff) |
* gc.c: fix build failure on FreeBSD introduced by r43763.
malloc_usable_size() is defined by malloc_np.h on FreeBSD.
* configure.in: check malloc.h and malloc_np.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | gc.c | 6 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Nov 22 09:03:16 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * gc.c: fix build failure on FreeBSD introduced by r43763. + malloc_usable_size() is defined by malloc_np.h on FreeBSD. + + * configure.in: check malloc.h and malloc_np.h. + Fri Nov 22 08:27:13 2013 Eric Hodel <drbrain@segment7.net> * lib/rubygems: Update to RubyGems master 50a8210. Important changes diff --git a/configure.in b/configure.in index 923843fe6f..5d86e14bd0 100644 --- a/configure.in +++ b/configure.in @@ -1091,6 +1091,8 @@ AC_CHECK_HEADERS( \ process.h \ sys/prctl.h \ atomic.h \ + malloc.h \ + malloc_np.h \ setjmpex.h ) @@ -40,7 +40,11 @@ # define malloc_usable_size(a) _msize(a) # endif #else -# include <malloc.h> +# ifdef HAVE_MALLOC_H +# include <malloc.h> +# elif defined(HAVE_MALLOC_NP_H) +# include <malloc_np.h> +# endif #endif #if /* is ASAN enabled? */ \ |