diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
| commit | 1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba (patch) | |
| tree | a6c4fb7f587a6949485717d13cea3e4fa53e3496 /host/lib/utils | |
| parent | 2d68f228888807d0fd76c7b759ec39fd86523f67 (diff) | |
| parent | ed4223d74cab604213b925da2eccb6055aa7aea2 (diff) | |
| download | uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.gz uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.bz2 uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
host/lib/usrp/dboard/db_ubx.cpp
Diffstat (limited to 'host/lib/utils')
| -rw-r--r-- | host/lib/utils/paths.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index 8f586ddf4..38839c8d4 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -283,7 +283,7 @@ std::string uhd::get_images_dir(const std::string &search_paths) { std::string _search_paths = search_paths; #ifdef UHD_IMAGES_DIR_WINREG_KEY - _search_paths = std::string("UHD_IMAGES_DIR_WINREG_KEY") + "," + search_paths; + _search_paths = std::string(STR(UHD_IMAGES_DIR_WINREG_KEY)) + "," + search_paths; #endif /* Now we will parse and attempt to qualify the paths in the `search_paths` |