From 6795022a23ac0f25183f3044aeba7cd549f50a67 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 30 Dec 2011 23:27:33 -0800 Subject: uhd: fixes that make uhd compile on freebsd Fixes gcc version check in byteswap. Fixes typo in thread prio. --- host/include/uhd/utils/byteswap.ipp | 2 +- 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 */ -- cgit v1.2.3