diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
| commit | 5bbcbaa397d596025c2a1d9db40c683b191a751b (patch) | |
| tree | b9cf2b93d13b5a41404fff803373df6f34877541 /host/include | |
| parent | b92662d5780f3a2d872e5ab96efc0760cce1fe53 (diff) | |
| parent | d3bdb8f1602fda76e0a5a2578cb06902abfe7209 (diff) | |
| download | uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.gz uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.bz2 uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.zip | |
Merge branch 'maint'
Conflicts:
fpga-src
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/transport/nirio/status.h | 7 | ||||
| -rw-r--r-- | host/include/uhd/version.hpp.in | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/host/include/uhd/transport/nirio/status.h b/host/include/uhd/transport/nirio/status.h index e4117ac73..917e66775 100644 --- a/host/include/uhd/transport/nirio/status.h +++ b/host/include/uhd/transport/nirio/status.h @@ -1,5 +1,5 @@ // -// Copyright 2013 Ettus Research LLC +// Copyright 2013-2014 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include <stddef.h> #include <stdint.h> #include <string> +#include <uhd/config.hpp> #include <uhd/exception.hpp> #define ENABLE_EXTENDED_ERROR_INFO false @@ -40,9 +41,9 @@ struct nirio_err_info { static const size_t NIRIO_ERROR_TABLE_SIZE; }; -const std::string lookup_err_msg(nirio_status code); +UHD_API const std::string lookup_err_msg(nirio_status code); -void nirio_status_to_exception(const nirio_status& status, const std::string& message); +UHD_API void nirio_status_to_exception(const nirio_status& status, const std::string& message); }} #define nirio_status_fatal(status) ((status) < 0) diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index 725a655c4..2d578d77e 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -27,7 +27,7 @@ * The format is oldest API compatible release - ABI compat number. * The compatibility number allows pre-release ABI to be versioned. */ -#define UHD_VERSION_ABI_STRING "3.8.0-0" +#define UHD_VERSION_ABI_STRING "3.8.2-0" /*! * A macro to check UHD version at compile-time. |