kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c: fix build failure on FreeBSD introduced by r43763.

Browse source 
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
This commit is contained in:
naruse 2013-11-22 00:05:34 +00:00
parent 62d6fc31c7
commit 215a7da2a6
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Fri Nov 22 08:27:13 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master 50a8210. Important changes * lib/rubygems: Update to RubyGems master 50a8210. Important changes

2
configure.in
View file

@ -1091,6 +1091,8 @@ AC_CHECK_HEADERS( \
process.h \ process.h \
sys/prctl.h \ sys/prctl.h \
atomic.h \ atomic.h \
malloc.h \
malloc_np.h \
setjmpex.h setjmpex.h
) )

6
gc.c
View file

@ -40,7 +40,11 @@
# define malloc_usable_size(a) _msize(a) # define malloc_usable_size(a) _msize(a)
# endif # endif
#else #else
# include <malloc.h> # ifdef HAVE_MALLOC_H
# include <malloc.h>
# elif defined(HAVE_MALLOC_NP_H)
# include <malloc_np.h>
# endif
#endif #endif
#if /* is ASAN enabled? */ \ #if /* is ASAN enabled? */ \