diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-02 14:57:20 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-02 15:26:28 +0200 |
| commit | f1be88688cf1ca4ab14f93ae1a75e0331a6577cb (patch) | |
| tree | 96455d55b484c82b01d950247656530a80de69e1 | |
| parent | c10df6edb8a48b4a57f73ccb6155d051a8cfb5d0 (diff) | |
Revert "sb138: #i115619# fix for MinGW"
This reverts commit 6727dc5d9414e77975b9fd765993c6e207f872f3.
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>
| -rw-r--r-- | include/osl/thread.h | 4 | ||||
| -rw-r--r-- | sal/osl/w32/thread.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/setthreadname/test-setthreadname.cxx | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/osl/thread.h b/include/osl/thread.h index d04fc0ef41fc..03d7cbd9d587 100644 --- a/include/osl/thread.h +++ b/include/osl/thread.h @@ -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 diff --git a/sal/osl/w32/thread.cxx b/sal/osl/w32/thread.cxx index c10950e9151f..d4a9d6d67060 100644 --- a/sal/osl/w32/thread.cxx +++ b/sal/osl/w32/thread.cxx @@ -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 { diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index c0c884eea7ab..9af8793eb1c2 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx @@ -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'); } |