aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/load_modules.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-06 11:46:19 -0700
committerJosh Blum <josh@joshknows.com>2010-04-06 11:46:19 -0700
commit9a0087da6c58e93fac6050c4541b1683a02b2d5b (patch)
tree495decb3c7a5dd0f1c6dac2b116c1f12859907be /host/lib/load_modules.cpp
parent275b29e07f97cdf638ecb22c602d26b7d340547a (diff)
parent8ee3d7200169983e7a20409ed5e8c37907fe66e1 (diff)
downloaduhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.tar.gz
uhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.tar.bz2
uhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.zip
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into rfx
Diffstat (limited to 'host/lib/load_modules.cpp')
-rw-r--r--host/lib/load_modules.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp
index babff1ca5..ef633325d 100644
--- a/host/lib/load_modules.cpp
+++ b/host/lib/load_modules.cpp
@@ -31,6 +31,7 @@ namespace fs = boost::filesystem;
**********************************************************************/
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
+static const std::string env_path_sep = ":";
static void load_module(const std::string &file_name){
if (dlopen(file_name.c_str(), RTLD_LAZY) == NULL){
@@ -42,6 +43,7 @@ static void load_module(const std::string &file_name){
#elif HAVE_WINDOWS_H
#include <windows.h>
+static const std::string env_path_sep = ";";
static void load_module(const std::string &file_name){
if (LoadLibrary(file_name.c_str()) == NULL){
@@ -52,6 +54,7 @@ static void load_module(const std::string &file_name){
}
#else
+static const std::string env_path_sep = ":";
static void load_module(const std::string &file_name){
throw std::runtime_error(str(
@@ -108,7 +111,7 @@ UHD_STATIC_BLOCK(load_modules){
//split the path at the path separators
std::vector<std::string> module_paths;
- boost::split(module_paths, env_module_path, boost::is_any_of(":;"));
+ boost::split(module_paths, env_module_path, boost::is_any_of(env_path_sep));
//load modules in each path
BOOST_FOREACH(const std::string &module_path, module_paths){