From a8bb5ec900d8f2d3d2f274a921d19b564c668323 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 21 Feb 2011 19:03:13 -0800
Subject: uhd: replace header checks in cmake files with more robust compile
 checks for features

implemented different ifdefs in the cpp files
---
 host/lib/utils/load_modules.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'host/lib/utils/load_modules.cpp')

diff --git a/host/lib/utils/load_modules.cpp b/host/lib/utils/load_modules.cpp
index 623d31eb6..fa9b22438 100644
--- a/host/lib/utils/load_modules.cpp
+++ b/host/lib/utils/load_modules.cpp
@@ -29,9 +29,8 @@ namespace fs = boost::filesystem;
 /***********************************************************************
  * Module Load Function
  **********************************************************************/
-#if defined(HAVE_DLFCN_H)
+#ifdef HAVE_DLOPEN
 #include <dlfcn.h>
-
 static void load_module(const std::string &file_name){
     if (dlopen(file_name.c_str(), RTLD_LAZY) == NULL){
         throw std::runtime_error(str(
@@ -39,10 +38,11 @@ static void load_module(const std::string &file_name){
         ));
     }
 }
+#endif /* HAVE_DLOPEN */
 
-#elif defined(HAVE_WINDOWS_H)
-#include <windows.h>
 
+#ifdef HAVE_LOAD_LIBRARY
+#include <windows.h>
 static void load_module(const std::string &file_name){
     if (LoadLibrary(file_name.c_str()) == NULL){
         throw std::runtime_error(str(
@@ -50,16 +50,16 @@ static void load_module(const std::string &file_name){
         ));
     }
 }
+#endif /* HAVE_LOAD_LIBRARY */
 
-#else
 
+#ifdef HAVE_LOAD_MODULES_DUMMY
 static void load_module(const std::string &file_name){
     throw std::runtime_error(str(
         boost::format("Module loading not supported: Cannot load \"%s\"") % file_name
     ));
 }
-
-#endif
+#endif /* HAVE_LOAD_MODULES_DUMMY */
 
 /***********************************************************************
  * Load Modules
-- 
cgit v1.2.3