From 0d845e4a071f67de40e1151cafb419c7aba87050 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 16 Mar 2026 11:35:06 -0700 Subject: merge revision(s) 361644c0cce3235e9cc6724994c6b5711deb10b8: [Backport #21917] [PATCH] [Bug #21917] Fix build on AIX --- dln.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dln.c b/dln.c index 2549f03183..d43735fec9 100644 --- a/dln.c +++ b/dln.c @@ -348,6 +348,7 @@ dln_open(const char *file) void *handle; #if defined(_WIN32) +# define DLN_DEFINED char message[1024]; /* Convert the file path to wide char */ @@ -374,6 +375,7 @@ dln_open(const char *file) # endif #elif defined(USE_DLN_DLOPEN) +# define DLN_DEFINED # ifndef RTLD_LAZY # define RTLD_LAZY 1 @@ -505,7 +507,7 @@ abi_check_enabled_p(void) static void * dln_load_and_init(const char *file, const char *init_fct_name) { -#if defined(_WIN32) || defined(USE_DLN_DLOPEN) +#if defined(DLN_DEFINED) void *handle = dln_open(file); #ifdef RUBY_DLN_CHECK_ABI @@ -523,6 +525,7 @@ dln_load_and_init(const char *file, const char *init_fct_name) return handle; #elif defined(_AIX) +# define DLN_DEFINED { void (*init_fct)(void); @@ -560,7 +563,7 @@ dln_load(const char *file) void * dln_load_feature(const char *file, const char *fname) { -#if defined(_WIN32) || defined(USE_DLN_DLOPEN) +#if defined(DLN_DEFINED) char *init_fct_name; init_funcname(&init_fct_name, fname); return dln_load_and_init(file, init_fct_name); -- cgit v1.2.3