From 70abda7e44deaedd6823e1540765c7ce438907a5 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 1 May 2015 04:29:20 +0000
Subject: dln.c: use EXPORT_PREFIX

* configure.in (EXPORT_PREFIX): define exported symbol prefix
  string in config.h.

* dln.c (FUNCNAME_PREFIX): use configured EXPORT_PREFIX, not
  hardcoded condition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 1 +
 dln.c        | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 3bb7fb7671..e2eb15db64 100644
--- a/configure.in
+++ b/configure.in
@@ -3983,6 +3983,7 @@ AC_SUBST(SYMBOL_PREFIX)
 AC_SUBST(MINIOBJS)
 AC_SUBST(THREAD_MODEL)
 AC_SUBST(PLATFORM_DIR)
+AC_DEFINE_UNQUOTED(EXPORT_PREFIX, "$EXPORT_PREFIX")
 
 firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
 firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
diff --git a/dln.c b/dln.c
index 355cec1090..aa1e622641 100644
--- a/dln.c
+++ b/dln.c
@@ -106,13 +106,7 @@ dln_loaderror(const char *format, ...)
 # define USE_DLN_DLOPEN
 #endif
 
-#ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
-#  define FUNCNAME_PREFIX "_Init_"
-# else
-#  define FUNCNAME_PREFIX "Init_"
-# endif
-#endif
+#define FUNCNAME_PREFIX EXPORT_PREFIX"Init_"
 
 #if defined __CYGWIN__ || defined DOSISH
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
-- 
cgit v1.2.3