usa	2016-12-27 18:28:20 +0900 (Tue, 27 Dec 2016)

  New Revision: 57208

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57208

  Log:
    merge revision(s) 56832: [Backport #12956]
    
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/dln.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/dln.c
===================================================================
--- ruby_2_2/dln.c	(revision 57207)
+++ ruby_2_2/dln.c	(revision 57208)
@@ -1335,7 +1335,9 @@ dln_load(const char *file) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/dln.c#L1335
 	    void *ex = dlsym(handle, EXTERNAL_PREFIX"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 */
 		rb_fatal("%s - %s", incompatible, file);
 #   else
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57207)
+++ ruby_2_2/version.h	(revision 57208)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
 #define RUBY_RELEASE_DATE "2016-12-27"
-#define RUBY_PATCHLEVEL 398
+#define RUBY_PATCHLEVEL 399
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56832


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/