firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

AIX port - avoid using non-standard function dladdr() unconditionally

Browse Source
This commit is contained in:
alexpeshkoff 2009-01-22 13:51:21 +00:00
parent 1e181aa272
commit 0bcde3f272
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -615,6 +615,7 @@ AC_FUNC_SETPGRP
AC_CHECK_FUNCS(setpgid) AC_CHECK_FUNCS(setpgid)
AC_FUNC_GETPGRP AC_FUNC_GETPGRP
AC_CHECK_FUNCS(flock) AC_CHECK_FUNCS(flock)
AC_CHECK_FUNCS(dladdr)
AC_CHECK_FUNCS(initgroups) AC_CHECK_FUNCS(initgroups)
AC_CHECK_FUNCS(getpagesize) AC_CHECK_FUNCS(getpagesize)
AC_CHECK_FUNCS(pread pwrite) AC_CHECK_FUNCS(pread pwrite)

4
src/jrd/fun.epp
View File

@ -87,6 +87,7 @@ namespace
#ifdef WIN_NT #ifdef WIN_NT
libUtilPath->assign("ib_util"); libUtilPath->assign("ib_util");
#else #else
#ifdef HAVE_DLADDR
Dl_info info; Dl_info info;
if (dladdr((void*) IbUtil::initialize, &info) != 0) if (dladdr((void*) IbUtil::initialize, &info) != 0)
{ {
@ -104,8 +105,9 @@ namespace
PathUtils::concatPath(libUtilPath, temp3, "../lib/libib_util"); PathUtils::concatPath(libUtilPath, temp3, "../lib/libib_util");
} }
else else
#endif // HAVE_DLADDR
libUtilPath->assign("libib_util"); libUtilPath->assign("libib_util");
#endif #endif // WIN_NT
ModuleLoader::doctorModuleExtention(libUtilPath); ModuleLoader::doctorModuleExtention(libUtilPath);
} }