diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-12 03:49:37 +0000 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-16 17:29:22 -0700 |
| commit | f29306c54536d0bbe9f76b67f4c3651888bc485e (patch) | |
| tree | aa5eec558d895f9dccd684a75c4ec419079b5c1b /host/lib/constants.hpp.in | |
| parent | 1bee816db5a925b17577010542fbbc459722f481 (diff) | |
| download | uhd-f29306c54536d0bbe9f76b67f4c3651888bc485e.tar.gz uhd-f29306c54536d0bbe9f76b67f4c3651888bc485e.tar.bz2 uhd-f29306c54536d0bbe9f76b67f4c3651888bc485e.zip | |
uhd: avoid segfaults - use CPP macros for paths and dont split empty string
Diffstat (limited to 'host/lib/constants.hpp.in')
| -rw-r--r-- | host/lib/constants.hpp.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/constants.hpp.in b/host/lib/constants.hpp.in index 295c8f16c..aa51e558c 100644 --- a/host/lib/constants.hpp.in +++ b/host/lib/constants.hpp.in @@ -21,8 +21,9 @@ #include <uhd/config.hpp> #include <string> -static const std::string UHD_VERSION_STRING = "@CPACK_PACKAGE_VERSION@"; -static const std::string UHD_INSTALL_PREFIX = "@CMAKE_INSTALL_PREFIX@"; -static const std::string UHD_PKG_DATA_DIR = "@PKG_DATA_DIR@"; +//these should be pre-processor macros to avoid static initialization issues +#define UHD_VERSION_STRING "@CPACK_PACKAGE_VERSION@" +#define UHD_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" +#define UHD_PKG_DATA_DIR "@PKG_DATA_DIR@" #endif /* INCLUDED_LIBUHD_CONSTANTS_HPP */ |