diff options
Diffstat (limited to 'src/lib/netlist/plib/pdynlib.cpp')
-rw-r--r-- | src/lib/netlist/plib/pdynlib.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index d08f194a137..f1901e4dda3 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -1,21 +1,23 @@ // license:GPL-2.0+ // copyright-holders:Couriersud /* - * pdynlib.c + * dynlib.c * */ -#include "pdynlib.h" -#ifdef _WIN32 +#include <plib/pdynlib.h> +#ifdef WIN32 #include "windows.h" #else #include <dlfcn.h> #endif -pdynlib::pdynlib(const pstring libname) +PLIB_NAMESPACE_START() + +dynlib::dynlib(const pstring libname) : m_isLoaded(false), m_lib(nullptr) { -#ifdef _WIN32 +#ifdef WIN32 //fprintf(stderr, "win: loading <%s>\n", libname.cstr()); if (libname != "") m_lib = LoadLibrary(libname.cstr()); @@ -38,11 +40,11 @@ pdynlib::pdynlib(const pstring libname) #endif } -pdynlib::pdynlib(const pstring path, const pstring libname) +dynlib::dynlib(const pstring path, const pstring libname) : m_isLoaded(false), m_lib(nullptr) { // printf("win: loading <%s>\n", libname.cstr()); -#ifdef _WIN32 +#ifdef WIN32 if (libname != "") m_lib = LoadLibrary(libname.cstr()); else @@ -68,11 +70,11 @@ pdynlib::pdynlib(const pstring path, const pstring libname) #endif } -pdynlib::~pdynlib() +dynlib::~dynlib() { if (m_lib != nullptr) { -#ifdef _WIN32 +#ifdef WIN32 #else dlclose(m_lib); //printf("Closed %s\n", dlerror()); @@ -80,16 +82,18 @@ pdynlib::~pdynlib() } } -bool pdynlib::isLoaded() const +bool dynlib::isLoaded() const { return m_isLoaded; } -void *pdynlib::getsym_p(const pstring name) +void *dynlib::getsym_p(const pstring name) { -#ifdef _WIN32 +#ifdef WIN32 return (void *) GetProcAddress((HMODULE) m_lib, name.cstr()); #else return dlsym(m_lib, name.cstr()); #endif } + +PLIB_NAMESPACE_END() |