diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-26 11:02:11 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-26 11:02:11 -0700 |
| commit | 6962543fec1b186bed4ad1332ee601eff07af1e1 (patch) | |
| tree | d3e3e91d2868f6e083d0723b20b00e6c5e948b4f | |
| parent | 36583c5b6a6a50f9bc801efb57edcc86a1f49974 (diff) | |
| download | uhd-6962543fec1b186bed4ad1332ee601eff07af1e1.tar.gz uhd-6962543fec1b186bed4ad1332ee601eff07af1e1.tar.bz2 uhd-6962543fec1b186bed4ad1332ee601eff07af1e1.zip | |
Pulling in patch from Marcus Leech for includes and older OSes.
| -rw-r--r-- | host/lib/usrp/b200/b200_iface.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/common/adf435x_common.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp index 5d799bf01..28a32aaef 100644 --- a/host/lib/usrp/b200/b200_iface.cpp +++ b/host/lib/usrp/b200/b200_iface.cpp @@ -32,6 +32,12 @@ #include <iomanip> #include <libusb.h> +//! libusb_error_name is only in newer API +#ifndef HAVE_LIBUSB_ERROR_NAME + #define libusb_error_name(code) \ + str(boost::format("LIBUSB_ERROR_CODE %d") % code) +#endif + using namespace uhd; using namespace uhd::transport; diff --git a/host/lib/usrp/common/adf435x_common.cpp b/host/lib/usrp/common/adf435x_common.cpp index f0df6a334..972a69388 100644 --- a/host/lib/usrp/common/adf435x_common.cpp +++ b/host/lib/usrp/common/adf435x_common.cpp @@ -16,8 +16,11 @@ // #include "adf435x_common.hpp" + #include <uhd/types/tune_request.hpp> #include <uhd/utils/log.hpp> +#include <cmath> + using namespace uhd; |