diff options
| author | Greg Veldman <git@gregv.net> | 2019-03-24 18:44:31 +0000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-03 21:01:16 +0200 |
| commit | ad03027114a8753fc7a0181df21d4d5e1905c509 (patch) | |
| tree | 54620828741c541c19dd373c527a48601e12ef1b /sal | |
| parent | Fix in convertToOOXMLHoriOrient: values of VertOrient were taken (diff) | |
| download | core-ad03027114a8753fc7a0181df21d4d5e1905c509.tar.gz core-ad03027114a8753fc7a0181df21d4d5e1905c509.zip | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/thread.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; }; |