summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/source/Host/freebsd/HostInfoFreeBSD.cpp2
-rw-r--r--lldb/source/Host/windows/HostInfoWindows.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp b/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp
index 8013114d89d..18eae3eb760 100644
--- a/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp
+++ b/lldb/source/Host/freebsd/HostInfoFreeBSD.cpp
@@ -23,7 +23,7 @@ llvm::VersionTuple HostInfoFreeBSD::GetOSVersion() {
::memset(&un, 0, sizeof(utsname));
if (uname(&un) < 0)
- return false;
+ return llvm::VersionTuple();
unsigned major, minor;
if (2 == sscanf(un.release, "%u.%u", &major, &minor))
diff --git a/lldb/source/Host/windows/HostInfoWindows.cpp b/lldb/source/Host/windows/HostInfoWindows.cpp
index a6e16d1ca61..5c0c2937d5e 100644
--- a/lldb/source/Host/windows/HostInfoWindows.cpp
+++ b/lldb/source/Host/windows/HostInfoWindows.cpp
@@ -63,12 +63,12 @@ llvm::VersionTuple HostInfoWindows::GetOSVersion() {
bool HostInfoWindows::GetOSBuildString(std::string &s) {
s.clear();
- uint32_t major, minor, update;
- if (!GetOSVersion(major, minor, update))
+ llvm::VersionTuple version = GetOSVersion();
+ if (version.empty())
return false;
llvm::raw_string_ostream stream(s);
- stream << "Windows NT " << major << "." << minor << "." << update;
+ stream << "Windows NT " << version.getAsString();
return true;
}
OpenPOWER on IntegriCloud