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

ruby-changes:49461

From: nobu <ko1@a...>
Date: Wed, 3 Jan 2018 18:19:16 +0900 (JST)
Subject: [ruby-changes:49461] nobu:r61577 (trunk): dln.c: dln_incompatible_library_p

nobu	2018-01-03 18:19:11 +0900 (Wed, 03 Jan 2018)

  New Revision: 61577

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

  Log:
    dln.c: dln_incompatible_library_p
    
    * dln.c (dln_incompatible_library_p): renamed as the error message
      with dln prefix, since it is not bound to xmalloc restrictively.

  Modified files:
    trunk/dln.c
Index: dln.c
===================================================================
--- dln.c	(revision 61576)
+++ dln.c	(revision 61577)
@@ -1244,8 +1244,6 @@ rb_w32_check_imported(HMODULE ext, HMODU https://github.com/ruby/ruby/blob/trunk/dln.c#L1244
 #endif
 
 #ifdef USE_DLN_DLOPEN
-static bool xmalloc_mismatch_p(void *handle);
-
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpedantic"
@@ -1253,8 +1251,8 @@ static bool xmalloc_mismatch_p(void *han https://github.com/ruby/ruby/blob/trunk/dln.c#L1251
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif
-bool
-xmalloc_mismatch_p(void *handle)
+static bool
+dln_incompatible_library_p(void *handle)
 {
     void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
     return ex && ex != ruby_xmalloc;
@@ -1353,7 +1351,7 @@ dln_load(const char *file) https://github.com/ruby/ruby/blob/trunk/dln.c#L1351
 	}
 # if defined RUBY_EXPORT
 	{
-	    if (xmalloc_mismatch_p(handle)) {
+	    if (dln_incompatible_library_p(handle)) {
 
 #   if defined __APPLE__ && \
     defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \

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

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