From 44cf5baa62469d5f8f6cca592ef2c3b25b80ed02 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 3 Jan 2018 09:19:11 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dln.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'dln.c') diff --git a/dln.c b/dln.c index 3a2960efca..9b82493019 100644 --- a/dln.c +++ b/dln.c @@ -1244,8 +1244,6 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine) #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 *handle); #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) } # 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) && \ -- cgit v1.2.3