[Libreoffice-commits] core.git: vcl/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 28 15:42:01 UTC 2019


 vcl/source/opengl/OpenGLHelper.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bf180165b07d6592f23b0bdda8e66fff4fa57eab
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Oct 28 14:49:12 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Oct 28 16:41:16 2019 +0100

    Blind fix for Android build ('unsigned int' vs. 'unsigned long')
    
    Change-Id: I04de54231abb8b34c93cbcb96c21cae78d90bfd4
    Reviewed-on: https://gerrit.libreoffice.org/81608
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index c02f142bef26..730b8922dccf 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -1035,12 +1035,14 @@ bool OpenGLWrapper::isVCLOpenGLEnabled()
 
 void OpenGLHelper::debugMsgStream(std::ostringstream const &pStream)
 {
-    debugMsgPrint(0, "%x: %s", osl_getThreadIdentifier(nullptr), pStream.str().c_str());
+    debugMsgPrint(
+        0, "%" SAL_PRIxUINT32 ": %s", osl_getThreadIdentifier(nullptr), pStream.str().c_str());
 }
 
 void OpenGLHelper::debugMsgStreamWarn(std::ostringstream const &pStream)
 {
-    debugMsgPrint(1, "%x: %s", osl_getThreadIdentifier(nullptr), pStream.str().c_str());
+    debugMsgPrint(
+        1, "%" SAL_PRIxUINT32 ": %s", osl_getThreadIdentifier(nullptr), pStream.str().c_str());
 }
 
 void OpenGLHelper::debugMsgPrint(const int nType, const char *pFormat, ...)


More information about the Libreoffice-commits mailing list