[前][次][番号順一覧][スレッド一覧]

ruby-changes:44759

From: nobu <ko1@a...>
Date: Sat, 19 Nov 2016 10:16:54 +0900 (JST)
Subject: [ruby-changes:44759] nobu:r56832 (trunk): dln.c: raise LoadError

nobu	2016-11-19 10:16:50 +0900 (Sat, 19 Nov 2016)

  New Revision: 56832

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

  Log:
    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 files:
    trunk/dln.c
Index: dln.c
===================================================================
--- dln.c	(revision 56831)
+++ dln.c	(revision 56832)
@@ -1333,7 +1333,9 @@ dln_load(const char *file) https://github.com/ruby/ruby/blob/trunk/dln.c#L1333
 	    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

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

[前][次][番号順一覧][スレッド一覧]