diff options
author | Josh Blum <josh@joshknows.com> | 2011-12-30 23:27:33 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-12-30 23:38:49 -0800 |
commit | a34559fc834cb7f9f25f0711bf26c5eeb269e734 (patch) | |
tree | 0c24a66146f1484ad4d7018b8fa8b7a802e66bad | |
parent | d38b2dbe35deca5480d1dc9853013c7b11be3018 (diff) | |
download | uhd-a34559fc834cb7f9f25f0711bf26c5eeb269e734.tar.gz uhd-a34559fc834cb7f9f25f0711bf26c5eeb269e734.tar.bz2 uhd-a34559fc834cb7f9f25f0711bf26c5eeb269e734.zip |
uhd: fixes that make uhd compile on freebsd
Fixes gcc version check in byteswap.
Fixes typo in thread prio.
-rw-r--r-- | host/include/uhd/utils/byteswap.ipp | 2 | ||||
-rw-r--r-- | host/lib/utils/thread_priority.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/include/uhd/utils/byteswap.ipp b/host/include/uhd/utils/byteswap.ipp index 51e9c28a0..5b2a7252f 100644 --- a/host/include/uhd/utils/byteswap.ipp +++ b/host/include/uhd/utils/byteswap.ipp @@ -36,7 +36,7 @@ return _byteswap_uint64(x); } -#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2 +#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ return (x>>8) | (x<<8); //DNE return __builtin_bswap16(x); diff --git a/host/lib/utils/thread_priority.cpp b/host/lib/utils/thread_priority.cpp index 6d6ca5630..699c5168a 100644 --- a/host/lib/utils/thread_priority.cpp +++ b/host/lib/utils/thread_priority.cpp @@ -98,9 +98,9 @@ static void check_priority_range(float priority){ /*********************************************************************** * Unimplemented API to set priority **********************************************************************/ -#ifdef HAVE_LOAD_MODULES_DUMMY +#ifdef HAVE_THREAD_PRIO_DUMMY void uhd::set_thread_priority(float, bool){ throw uhd::not_implemented_error("set thread priority not implemented"); } -#endif /* HAVE_LOAD_MODULES_DUMMY */ +#endif /* HAVE_THREAD_PRIO_DUMMY */ |