diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-01-05 09:32:23 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-01-05 09:32:23 -0800 |
| commit | 75f3270d0cc199bf0665bc1612fe8e1b020aee1f (patch) | |
| tree | e5960aaf348a7e8ad11e5385eea944165228c9af /host/include | |
| parent | 01181d2fa6270fbbbc34ff4cb1e75b44cb7f9e1b (diff) | |
| parent | f86f209b3370be54ec0870186ab1b9d8988736eb (diff) | |
| download | uhd-75f3270d0cc199bf0665bc1612fe8e1b020aee1f.tar.gz uhd-75f3270d0cc199bf0665bc1612fe8e1b020aee1f.tar.bz2 uhd-75f3270d0cc199bf0665bc1612fe8e1b020aee1f.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/usrp.h | 2 | ||||
| -rw-r--r-- | host/include/uhd/version.hpp.in | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/host/include/uhd/usrp/usrp.h b/host/include/uhd/usrp/usrp.h index f24d12b85..bb186a278 100644 --- a/host/include/uhd/usrp/usrp.h +++ b/host/include/uhd/usrp/usrp.h @@ -30,6 +30,8 @@ #include <uhd/usrp/mboard_eeprom.h> #include <uhd/usrp/dboard_eeprom.h> #include <uhd/usrp/subdev_spec.h> +/* version.hpp is safe to include in C: */ +#include <uhd/version.hpp> /* Provides UHD_VERSION */ #include <stdbool.h> #include <stdlib.h> diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index f63d973e9..c16739a78 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -18,9 +18,6 @@ #ifndef INCLUDED_UHD_VERSION_HPP #define INCLUDED_UHD_VERSION_HPP -#include <uhd/config.hpp> -#include <string> - /*! * The ABI version string that the client application builds against. * Call get_abi_string() to check this against the library build. @@ -36,6 +33,10 @@ */ #define UHD_VERSION @UHD_VERSION_ADDED@ +#ifdef __cplusplus +#include <uhd/config.hpp> +#include <string> + namespace uhd{ //! Get the version string (dotted version number + build info) @@ -45,5 +46,6 @@ namespace uhd{ UHD_API std::string get_abi_string(void); } //namespace uhd +#endif #endif /* INCLUDED_UHD_VERSION_HPP */ |