sal/osl/unx/thread.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ad03027114a8753fc7a0181df21d4d5e1905c509
Author: Greg Veldman <g...@gregv.net>
AuthorDate: Sun Mar 24 18:44:31 2019 +0000
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Apr 3 21:01:16 2019 +0200
In LibreOffice core commit d4d3766, several variables were changed
to be declared as const. However, on platforms not excluded by
NO_PTHREAD_PRIORITY, osl_thread_priority_init_Impl() then tries
later to assign values to these. This leads to compiler errors
on platforms so affected, including FreeBSD. Revert as necessary
on affected platforms, also using NO_PTHREAD_PRIORITY to match
the code in osl_thread_priority_init_Impl().
Change-Id: I0e968231e7c1be9771844222a7bab1f0fcb51a0e
Reviewed-on: https://gerrit.libreoffice.org/69603
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index f963f302bc53..5ea77495daa6 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -88,11 +88,11 @@ typedef struct osl_thread_impl_st
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 +110,7 @@ static void osl_thread_textencoding_init_Impl();
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;
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
