summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-03 09:19:11 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-03 09:19:11 (GMT)
commit44cf5baa62469d5f8f6cca592ef2c3b25b80ed02 (patch)
treeb502cd6e420b5bfa9f5bdb1fd5e20e6c27d03e1a
parent21a2146e1d4a8e7c27e36966bf4bb73cf48e9d7b (diff)
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
-rw-r--r--dln.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/dln.c b/dln.c
index 3a2960e..9b82493 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) && \