generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 02:18:04 +01:00
Code Issues Projects Releases Wiki Activity

backport SharedLibrary changes from 1.4.2-p1

Browse Source
This commit is contained in:
Marian Krivos
2011-11-04 18:56:08 +00:00
parent 5084562770
commit 97ec3f5bf6
16 changed files with 155 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Foundation/src/SharedLibrary_UNIX.cpp
View File

@@ -62,16 +62,17 @@ SharedLibraryImpl::~SharedLibraryImpl()
}
void SharedLibraryImpl::loadImpl(const std::string& path)
void SharedLibraryImpl::loadImpl(const std::string& path, int flags)
{
FastMutex::ScopedLock lock(_mutex);
if (_handle) throw LibraryAlreadyLoadedException(path);
int flags = RTLD_LAZY | RTLD_GLOBAL;
#if defined(RTLD_DEEPBIND)
flags |= RTLD_DEEPBIND;
#endif
_handle = dlopen(path.c_str(), flags);
int realFlags = RTLD_LAZY;
if (flags & SHLIB_LOCAL_IMPL)
realFlags |= RTLD_LOCAL;
else
realFlags |= RTLD_GLOBAL;
_handle = dlopen(path.c_str(), realFlags);
if (!_handle)
{
const char* err = dlerror();