[Lldb-commits] [lldb] r334952 - Attempt to fix windows&freebsd builds broken by r334950

[Pavel Labath via lldb-commits]

Author: labath
Date: Mon Jun 18 08:29:42 2018
New Revision: 334952

URL: http://llvm.org/viewvc/llvm-project?rev=334952&view=rev
Log:
Attempt to fix windows&freebsd builds broken by r334950

Modified:
    lldb/trunk/source/Host/freebsd/HostInfoFreeBSD.cpp
    lldb/trunk/source/Host/windows/HostInfoWindows.cpp

Modified: lldb/trunk/source/Host/freebsd/HostInfoFreeBSD.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/freebsd/HostInfoFreeBSD.cpp?rev=334952&r1=334951&r2=334952&view=diff
==============================================================================
--- lldb/trunk/source/Host/freebsd/HostInfoFreeBSD.cpp (original)
+++ lldb/trunk/source/Host/freebsd/HostInfoFreeBSD.cpp Mon Jun 18 08:29:42 2018
@@ -23,7 +23,7 @@ llvm::VersionTuple HostInfoFreeBSD::GetO
 
   ::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))

Modified: lldb/trunk/source/Host/windows/HostInfoWindows.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/HostInfoWindows.cpp?rev=334952&r1=334951&r2=334952&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/HostInfoWindows.cpp (original)
+++ lldb/trunk/source/Host/windows/HostInfoWindows.cpp Mon Jun 18 08:29:42 2018
@@ -63,12 +63,12 @@ llvm::VersionTuple HostInfoWindows::GetO
 
 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;
 }
 


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits