[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/unx

Michael Stahl mstahl at redhat.com
Sun Jul 16 15:24:23 UTC 2017


 vcl/unx/generic/app/sm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d520837ca24fbe0ba8f0ed9043bf7ddca354e032
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 13 15:41:02 2017 +0200

    vcl: fix -Werror=format (32-bit GCC)
    
    Change-Id: Ia7afb5b9750704797ff8030688d0531c27d80836
    (cherry picked from commit c356884319f254fdd944376fe2f841532dc36433)
    Reviewed-on: https://gerrit.libreoffice.org/39965
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index e33ccfd50726..9242677c1521 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -358,7 +358,7 @@ void SessionManagerClient::SaveYourselfProc(
                                                  (interact_style == SmInteractStyleErrors) ? "SmInteractStyleErrors" :
                                                                                              "SmInteractStyleAny"));
     char num[100];
-    snprintf(num, sizeof(num), "_%d_%d", now.Seconds, (now.Nanosec / 1000));
+    snprintf(num, sizeof(num), "_%" SAL_PRIuUINT32 "_%" SAL_PRIuUINT32, now.Seconds, (now.Nanosec / 1001));
     m_aTimeID = OString(num);
 
     BuildSmPropertyList();


More information about the Libreoffice-commits mailing list