diff options
| author | Philip Balister <philip@opensdr.com> | 2010-04-01 12:44:19 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-04-01 12:44:19 +0000 |
| commit | 93572731923e43bbb34a12db41170e56376ab03b (patch) | |
| tree | a46c53d1695a211dac39e46abf60a8f517e8d287 /host/lib/load_modules.cpp | |
| parent | 930755fce1e5d22a5ede0459dccd6c9501fc642c (diff) | |
| parent | 03be4d0673c5e0f597db7d27f535956a591bbeb7 (diff) | |
| download | uhd-93572731923e43bbb34a12db41170e56376ab03b.tar.gz uhd-93572731923e43bbb34a12db41170e56376ab03b.tar.bz2 uhd-93572731923e43bbb34a12db41170e56376ab03b.zip | |
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Diffstat (limited to 'host/lib/load_modules.cpp')
| -rw-r--r-- | host/lib/load_modules.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp index 700afcd3f..babff1ca5 100644 --- a/host/lib/load_modules.cpp +++ b/host/lib/load_modules.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include <uhd/utils.hpp> +#include <uhd/utils/static.hpp> #include <boost/format.hpp> #include <boost/foreach.hpp> #include <boost/algorithm/string.hpp> @@ -40,8 +40,8 @@ static void load_module(const std::string &file_name){ } } -#elif HAVE_WINBASE_H -#include <Winbase.h> +#elif HAVE_WINDOWS_H +#include <windows.h> static void load_module(const std::string &file_name){ if (LoadLibrary(file_name.c_str()) == NULL){ @@ -101,7 +101,7 @@ static void load_path(const fs::path &path){ * Load all the modules given by the module path enviroment variable. * The path variable may be several paths split by path separators. */ -STATIC_BLOCK(load_modules){ +UHD_STATIC_BLOCK(load_modules){ //get the environment variable module path char *env_module_path = std::getenv("UHD_MODULE_PATH"); if (env_module_path == NULL) return; |