Author: labath
Date: Mon Jun 18 08:44:36 2018
New Revision: 334953
URL: http://llvm.org/viewvc/llvm-project?rev=334953&view=rev
Log:
Fix netbsd build broken by r334950
This also includes one more build fix for windows.
Modified:
lldb/trunk/source/Host/netbsd/HostInfoNetBSD.cpp
lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.cpp
Modified: lldb/trunk/source/Host/netbsd/HostInfoNetBSD.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/netbsd/HostInfoNetBSD.cpp?rev=334953&r1=334952&r2=334953&view=diff
==============================================================================
--- lldb/trunk/source/Host/netbsd/HostInfoNetBSD.cpp (original)
+++ lldb/trunk/source/Host/netbsd/HostInfoNetBSD.cpp Mon Jun 18 08:44:36 2018
@@ -26,9 +26,10 @@ llvm::VersionTuple HostInfoNetBSD::GetOS
::memset(&un, 0, sizeof(un));
if (::uname(&un) < 0)
- return false;
+ return VersionTuple();
/* Accept versions like 7.99.21 and 6.1_STABLE */
+ uint32_t major, minor, update;
int status = ::sscanf(un.release, "%" PRIu32 ".%" PRIu32 ".%" PRIu32, &major,
&minor, &update);
switch (status) {
Modified: lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.cpp?rev=334953&r1=334952&r2=334953&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.cpp Mon Jun 18
08:44:36 2018
@@ -568,16 +568,8 @@ void PlatformWindows::GetStatus(Stream &
Platform::GetStatus(strm);
#ifdef _WIN32
- uint32_t major;
- uint32_t minor;
- uint32_t update;
- if (!HostInfo::GetOSVersion(major, minor, update)) {
- strm << "Windows";
- return;
- }
-
- strm << "Host: Windows " << major << '.' << minor << " Build: " << update
- << '\n';
+ llvm::VersionTuple version = HostInfo::GetOSVersion();
+ strm << "Host: Windows " << version.getAsString() << '\n';
#endif
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
