mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-14 22:42:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1035 from AlexandreRouma/master

Browse Source 
merge back changes to master
This commit is contained in:
AlexandreRouma 2023-04-03 20:40:25 +02:00 committed by GitHub
commit 2676190d3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/module.cpp
View File

@ -33,7 +33,7 @@ ModuleManager::Module_t ModuleManager::loadModule(std::string path) {
#else #else
mod.handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL); mod.handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (mod.handle == NULL) { if (mod.handle == NULL) {
flog::error("Couldn't load {0}.", path); flog::error("Couldn't load {0}: {1}", path, dlerror());
mod.handle = NULL; mod.handle = NULL;
return mod; return mod;
} }
@ -183,4 +183,4 @@ void ModuleManager::doPostInitAll() {
flog::info("Running post-init for {0}", name); flog::info("Running post-init for {0}", name);
inst.instance->postInit(); inst.instance->postInit();
} }
} }

1
core/src/utils/net.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <string>
#include <mutex> #include <mutex>
#include <memory> #include <memory>
#include <map> #include <map>