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

merge revision(s) 56832: [Backport #12956]

Browse source 
dln.c: raise LoadError

	* dln.c (dln_load): raise LoadError instead of fatal error on
  recent OSX, dlclose seems fixed in El Capitan or later.
  [ruby-core:78200] [Bug #12956]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@57344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-01-16 19:09:23 +00:00
parent c6250c600e
commit db4eec7249
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dln.c
View file

@ -1331,7 +1331,9 @@ dln_load(const char *file)
void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc"); void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
if (ex && ex != ruby_xmalloc) { if (ex && ex != ruby_xmalloc) {
# if defined __APPLE__ # if defined __APPLE__ && \
defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
/* dlclose() segfaults */ /* dlclose() segfaults */
rb_fatal("%s - %s", incompatible, file); rb_fatal("%s - %s", incompatible, file);
# else # else

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3" #define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-01-17" #define RUBY_RELEASE_DATE "2017-01-17"
#define RUBY_PATCHLEVEL 228 #define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1