diff options
Diffstat (limited to 'editors/libreoffice/files/patch-sal_osl_unx_thread.cxx')
| -rw-r--r-- | editors/libreoffice/files/patch-sal_osl_unx_thread.cxx | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx b/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx index 56439e0d9c79..78bdf8dd757f 100644 --- a/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx +++ b/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx @@ -1,6 +1,10 @@ ---- sal/osl/unx/thread.cxx.orig 2017-12-12 17:31:34.756103000 +0300 -+++ sal/osl/unx/thread.cxx 2017-12-12 17:33:13.924729000 +0300 -@@ -45,6 +45,10 @@ +osl_thread_priority_init_Impl() tries to assign values to variables +declared as const on platforms not excluded by NO_PTHREAD_PRIORITY. +This includes FreeBSD. Patch locally until fixed upstream. + +--- sal/osl/unx/thread.cxx.orig 2019-02-12 22:11:36.000000000 +0000 ++++ sal/osl/unx/thread.cxx 2019-02-18 23:03:57.933036000 +0000 +@@ -46,6 +46,10 @@ #include <sys/syscall.h> #endif @@ -11,6 +15,32 @@ /**************************************************************************** * @@@ TODO @@@ * +@@ -88,11 +92,11 @@ + + struct osl_thread_priority_st + { +- int const m_Highest; +- int const m_Above_Normal; +- int const m_Normal; +- int const m_Below_Normal; +- int const m_Lowest; ++ int m_Highest; ++ int m_Above_Normal; ++ int m_Normal; ++ int m_Below_Normal; ++ int m_Lowest; + }; + + #define OSL_THREAD_PRIORITY_INITIALIZER { 127, 96, 64, 32, 0 } +@@ -110,7 +114,7 @@ + struct osl_thread_global_st + { + pthread_once_t m_once; +- struct osl_thread_priority_st const m_priority; ++ struct osl_thread_priority_st m_priority; + struct osl_thread_textencoding_st m_textencoding; + }; + @@ -545,7 +549,7 @@ if ( 0 != err ) SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err); |