Revert "sb138: #i115619# fix for MinGW"
This reverts commit 6727dc5d94
.
We now don't support compiling using MinGW.
Change-Id: I0dee00780bfb4b7deceddd8cd30af03b7f7ed212
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116591
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
parent
c10df6edb8
commit
f1be88688c
3 changed files with 3 additions and 8 deletions
|
@ -191,8 +191,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_yieldThread(void);
|
|||
|
||||
The name of a thread is usually evaluated for debugging purposes. Not all
|
||||
platforms support this. On Linux, a set thread name can be observed with
|
||||
"ps -L". On Windows with the Microsoft compiler, a thread name set while a
|
||||
debugger is attached can be observed within the debugger.
|
||||
"ps -L". On Windows a thread name set while a debugger is attached can be
|
||||
observed within the debugger.
|
||||
|
||||
@param name the name of the thread; must not be null; on Linux, only the
|
||||
first 16 characters are used
|
||||
|
|
|
@ -359,7 +359,6 @@ void SAL_CALL osl_yieldThread(void)
|
|||
}
|
||||
|
||||
void SAL_CALL osl_setThreadName(char const * name) {
|
||||
#ifdef _MSC_VER
|
||||
/* See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>: */
|
||||
#pragma pack(push, 8)
|
||||
struct {
|
||||
|
@ -378,9 +377,6 @@ void SAL_CALL osl_setThreadName(char const * name) {
|
|||
0x406D1388, 0, sizeof info / sizeof (ULONG_PTR),
|
||||
reinterpret_cast<ULONG_PTR *>(&info));
|
||||
} __except (EXCEPTION_EXECUTE_HANDLER) {}
|
||||
#else
|
||||
(void) name;
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -51,8 +51,7 @@ void TestThread::run() {
|
|||
setName("TestThread");
|
||||
if (std::getenv("URE_TEST_SETTHREADNAME") != nullptr) {
|
||||
// On Linux, the thread name can now be observed with "ps -L"; on
|
||||
// Windows with the Microsoft compiler, the thread name can now be
|
||||
// observed in a debugger.
|
||||
// Windows, the thread name can now be observed in a debugger.
|
||||
std::cout << "stop: ";
|
||||
std::cin.ignore(std::numeric_limits< int >::max(), '\n');
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue