intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-15 12:25:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correctly fix ScriptInterpreterPython::ExecuteOneLine for windows.

Browse Source 
llvm-svn: 219435
This commit is contained in:
Zachary Turner
2014-10-09 20:17:53 +00:00
parent bd64d46188
commit 8ada0b9713
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/include/lldb/Host/TimeValue.h
View File

@@ -100,11 +100,11 @@ public:
/// Returns only the fractional portion of the TimeValue rounded down to the
/// nearest millisecond (divide by one million).
/// @brief Retrieve the fractional part as milliseconds;
/// @brief Retrieve the milliseconds component;
uint32_t
milliseconds() const
{
return nanoseconds() / NanoSecPerMilliSec;
return m_nano_seconds / NanoSecPerMilliSec;
}
protected:

2
lldb/source/Host/windows/ConnectionGenericFileWindows.cpp
View File

@@ -229,7 +229,7 @@ ConnectionGenericFile::Read(void *dst, size_t dst_len, uint32_t timeout_usec, ll
// ERROR_OPERATION_ABORTED occurs when someone calls Disconnect() during a blocking read.
// This triggers a call to CancelIoEx, which causes the operation to complete and the
// result to be ERROR_OPERATION_ABORTED.
if (result_error == ERROR_HANDLE_EOF || result_error == ERROR_OPERATION_ABORTED)
if (result_error == ERROR_HANDLE_EOF || result_error == ERROR_OPERATION_ABORTED || result_error == ERROR_BROKEN_PIPE)
return_info.Set(bytes_read, eConnectionStatusEndOfFile, 0);
else
return_info.Set(bytes_read, eConnectionStatusError, result_error);