sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix conditional dlopen support

Browse source
This commit is contained in:
Dane Springmeyer 2014-12-18 21:13:47 -08:00
parent b0f94bff44
commit b235910895
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/plugin.cpp
View file

@ -30,9 +30,11 @@
#define dlsym GetProcAddress
#define dlclose FreeLibrary
#define dlerror GetLastError
#define MAPNIK_SUPPORTS_DLOPEN
#else
#ifdef MAPNIK_HAS_DLCFN
#include <dlfcn.h>
#define MAPNIK_SUPPORTS_DLOPEN
#endif
#define handle void *
#endif
@ -77,17 +79,17 @@ PluginInfo::~PluginInfo()
{
if (module_)
{
#ifdef MAPNIK_HAS_DLCFN
#ifdef MAPNIK_SUPPORTS_DLOPEN
if (module_->dl) dlclose(module_->dl),module_->dl=0;
delete module_;
#endif
delete module_;
}
}
void * PluginInfo::get_symbol(std::string const& sym_name) const
{
#ifdef MAPNIK_HAS_DLCFN
#ifdef MAPNIK_SUPPORTS_DLOPEN
return static_cast<void *>(dlsym(module_->dl, sym_name.c_str()));
#else
return NULL;
@ -101,7 +103,9 @@ std::string const& PluginInfo::name() const
bool PluginInfo::valid() const
{
#ifdef MAPNIK_SUPPORTS_DLOPEN
if (module_ && module_->dl && !name_.empty()) return true;
#endif
return false;
}