diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-12 03:49:37 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-12 03:49:37 +0000 |
| commit | 2ce128a2cf9ea8bea23e2cea28d0729719b42968 (patch) | |
| tree | de1ee90d4aba095b221e09b2785229ee2ee5c68e /host/lib/constants.hpp.in | |
| parent | 0482853a708fead6f2d5baedb4eee6af376333f0 (diff) | |
| download | uhd-2ce128a2cf9ea8bea23e2cea28d0729719b42968.tar.gz uhd-2ce128a2cf9ea8bea23e2cea28d0729719b42968.tar.bz2 uhd-2ce128a2cf9ea8bea23e2cea28d0729719b42968.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 */ |