diff options
author | 2016-08-07 21:52:42 +0200 | |
---|---|---|
committer | 2016-08-07 22:28:04 +0200 | |
commit | 8c297602c46de8115581f96b11f0d405a83232fb (patch) | |
tree | 32e91b412f3ef8ef4554076947ea251d32393f4d /src/lib/netlist/plib/pdynlib.cpp | |
parent | 8b6f09adcc3e7f5f6bacdccd4a4b11ab4390eb80 (diff) |
Fix noexcept and NL_NOEXCEPT to pass g++ 6.x builds. (nw)
Diffstat (limited to 'src/lib/netlist/plib/pdynlib.cpp')
-rw-r--r-- | src/lib/netlist/plib/pdynlib.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index 2088ab47c1b..0ed2ca3a620 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -7,7 +7,7 @@ #include "pdynlib.h" -#ifdef WIN32 +#ifdef _WIN32 #include "windows.h" #include "palloc.h" @@ -61,7 +61,7 @@ namespace plib { dynlib::dynlib(const pstring libname) : m_isLoaded(false), m_lib(nullptr) { -#ifdef WIN32 +#ifdef _WIN32 //fprintf(stderr, "win: loading <%s>\n", libname.cstr()); TCHAR *buffer = tstring_from_utf8(libname.cstr()); if (libname != "") @@ -90,7 +90,7 @@ 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 TCHAR *buffer = tstring_from_utf8(libname.cstr()); if (libname != "") m_lib = LoadLibrary(buffer); @@ -122,7 +122,7 @@ dynlib::~dynlib() { if (m_lib != nullptr) { -#ifdef WIN32 +#ifdef _WIN32 #else dlclose(m_lib); //printf("Closed %s\n", dlerror()); @@ -137,7 +137,7 @@ bool dynlib::isLoaded() const 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()); |