diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-10-12 15:55:21 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-10-12 15:55:21 +0100 |
| commit | a3e0768758ca68429a29d9c78ce672f2d938c6e7 (patch) | |
| tree | a66b4c4f917d56e1cef8ffda450d535ea532be35 /src/dynamic.cpp | |
| parent | c46f8a368c42f64284244f3d2dfc022a383294fa (diff) | |
| parent | 0337b92c158fa662f04056343affd59315da78db (diff) | |
Merge the latest changes from insp20 into master.
Diffstat (limited to 'src/dynamic.cpp')
| -rw-r--r-- | src/dynamic.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 340f40e19..f138b04d1 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -43,11 +43,7 @@ DLLManager::DLLManager(const char *fname) h = dlopen(fname, RTLD_NOW|RTLD_LOCAL); if (!h) { -#ifdef _WIN32 RetrieveLastError(); -#else - err = dlerror(); -#endif } } @@ -72,11 +68,7 @@ Module* DLLManager::CallInit() initfn.vptr = dlsym(h, MODULE_INIT_STR); if (!initfn.vptr) { -#ifdef _WIN32 RetrieveLastError(); -#else - err = dlerror(); -#endif return NULL; } @@ -94,18 +86,21 @@ std::string DLLManager::GetVersion() return ""; } -#ifdef _WIN32 void DLLManager::RetrieveLastError() { +#if defined _WIN32 char errmsg[500]; DWORD dwErrorCode = GetLastError(); if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0) sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode); SetLastError(ERROR_SUCCESS); err = errmsg; +#else + char* errmsg = dlerror(); + err = errmsg ? errmsg : "Unknown error"; +#endif std::string::size_type p; while ((p = err.find_last_of("\r\n")) != std::string::npos) err.erase(p, 1); } -#endif |