diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | load.c | 17 |
2 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index c83145f355..d2b3f8f182 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,7 +1662,7 @@ AC_CACHE_CHECK(for function name string predefined identifier, RUBY_WERROR_FLAG([ for func in __func__ __FUNCTION__; do AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]], - [[puts($func);]])], + [[puts($func);]])], [rb_cv_function_name_string=$func break]) done @@ -2862,7 +2862,6 @@ AC_SUBST(CCDLFLAGS)dnl AC_SUBST(LDSHARED)dnl AC_SUBST(LDSHAREDXX)dnl AC_SUBST(DLEXT)dnl -AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl AC_SUBST(ASMEXT, S)dnl @@ -3182,10 +3181,8 @@ AS_IF([test x"$LOAD_RELATIVE" = x1], [ len=2 # .rb n=`expr "$DLEXT" : '.*'`; test "$n" -gt "$len" && len=$n -n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`) test ".$DLEXT" = "." || AC_DEFINE_UNQUOTED(DLEXT, ".$DLEXT") -test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2") AC_SUBST(DLEXT) : "strip" && { @@ -21,17 +21,10 @@ static VALUE ruby_dln_librefs; #define IS_RBEXT(e) (strcmp((e), ".rb") == 0) #define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0) -#ifdef DLEXT2 -#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0 || strcmp((e), DLEXT2) == 0) -#else #define IS_DLEXT(e) (strcmp((e), DLEXT) == 0) -#endif static const char *const loadable_ext[] = { ".rb", DLEXT, -#ifdef DLEXT2 - DLEXT2, -#endif 0 }; @@ -931,15 +924,6 @@ search_required(VALUE fname, volatile VALUE *path, feature_func rb_feature_p) return 's'; } tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname)); -#ifdef DLEXT2 - OBJ_FREEZE(tmp); - if (rb_find_file_ext(&tmp, loadable_ext + 1)) { - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(ftptr, ext, FALSE, TRUE, &loading) || loading) - *path = tmp; - return 's'; - } -#else rb_str_cat2(tmp, DLEXT); OBJ_FREEZE(tmp); if ((tmp = rb_find_file(tmp)) != 0) { @@ -948,7 +932,6 @@ search_required(VALUE fname, volatile VALUE *path, feature_func rb_feature_p) *path = tmp; return 's'; } -#endif } else if (IS_DLEXT(ext)) { if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) { |