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

ruby-changes:38332

From: nobu <ko1@a...>
Date: Fri, 1 May 2015 13:41:35 +0900 (JST)
Subject: [ruby-changes:38332] nobu:r50413 (trunk): dln.c: raise fatal

nobu	2015-05-01 13:41:27 +0900 (Fri, 01 May 2015)

  New Revision: 50413

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

  Log:
    dln.c: raise fatal
    
    * dln.c (dln_load): raise fatal error on OSX not other extension
      libraries to refer different libruby.

  Modified files:
    trunk/dln.c
Index: dln.c
===================================================================
--- dln.c	(revision 50412)
+++ dln.c	(revision 50413)
@@ -1330,12 +1330,14 @@ dln_load(const char *file) https://github.com/ruby/ruby/blob/trunk/dln.c#L1330
 	    void *ex = dlsym(handle, EXPORT_PREFIX"ruby_xmalloc");
 	    if (ex && ex != ruby_xmalloc) {
 
-#   if !defined __APPLE__
+#   if defined __APPLE__
 		/* dlclose() segfaults */
+		rb_fatal("%s - %s", incompatible, file);
+#   else
 		dlclose(handle);
-#   endif
 		error = incompatible;
 		goto failed;
+#   endif
 	    }
 	}
 # endif

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

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