diff options
| author | Josh Blum <josh@joshknows.com> | 2010-05-03 11:33:15 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-05-03 11:33:15 -0700 |
| commit | be97b68ba230e16b513e5a0310aded49f4b2dcb4 (patch) | |
| tree | 8d54876d0c1c28ecf0d2b66b1803457919459492 | |
| parent | ba9708b786db08e2e3d55cd27f70bfeb31966880 (diff) | |
| download | uhd-be97b68ba230e16b513e5a0310aded49f4b2dcb4.tar.gz uhd-be97b68ba230e16b513e5a0310aded49f4b2dcb4.tar.bz2 uhd-be97b68ba230e16b513e5a0310aded49f4b2dcb4.zip | |
windows tweaks to config
| -rw-r--r-- | host/include/uhd/config.hpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 227c473ce..32eafc89b 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -39,27 +39,23 @@ //define logical operators #ifdef BOOST_MSVC - #define not ! - #define and && - #define or || + #include <ciso646> #endif // http://gcc.gnu.org/wiki/Visibility // Generic helper definitions for shared library support -#if BOOST_HAS_DECLSPEC +#if defined(BOOST_HAS_DECLSPEC) #define UHD_HELPER_DLL_IMPORT __declspec(dllimport) #define UHD_HELPER_DLL_EXPORT __declspec(dllexport) #define UHD_HELPER_DLL_LOCAL +#elif defined(__GNUG__) && __GNUG__ >= 4 + #define UHD_HELPER_DLL_IMPORT __attribute__ ((visibility("default"))) + #define UHD_HELPER_DLL_EXPORT __attribute__ ((visibility("default"))) + #define UHD_HELPER_DLL_LOCAL __attribute__ ((visibility("hidden"))) #else - #if __GNUG__ >= 4 - #define UHD_HELPER_DLL_IMPORT __attribute__ ((visibility("default"))) - #define UHD_HELPER_DLL_EXPORT __attribute__ ((visibility("default"))) - #define UHD_HELPER_DLL_LOCAL __attribute__ ((visibility("hidden"))) - #else - #define UHD_HELPER_DLL_IMPORT - #define UHD_HELPER_DLL_EXPORT - #define UHD_HELPER_DLL_LOCAL - #endif + #define UHD_HELPER_DLL_IMPORT + #define UHD_HELPER_DLL_EXPORT + #define UHD_HELPER_DLL_LOCAL #endif // Now we use the generic helper definitions above to define UHD_API and UHD_LOCAL. |