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

[Miklos Vajna (via logerrit)]

 tools/source/misc/json_writer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51a4c85bf9228a3750b61cb54e64c8134314a35e
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Jun 29 09:59:53 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jun 29 12:31:52 2020 +0200

    tools: fix 32bit Android build
    
    tools/source/misc/json_writer.cxx:289:34: error: format specifies type 'long' but the argument has type 'sal_Int64' (aka 'long long') [-Werror,-Wformat]
        mPos += sprintf(mPos, "%ld", nPropVal);
                               ~~~   ^~~~~~~~
                               %lld
    1 error generated.
    
    Change-Id: Ieacf2f521f77292d61fa714bf584c9e2045c2e1b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97367
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/tools/source/misc/json_writer.cxx b/tools/source/misc/json_writer.cxx
index aacf3f709c90..e815a0b6b173 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -286,7 +286,7 @@ void JsonWriter::put(const char* pPropName, sal_Int64 nPropVal)
     memcpy(mPos, "\": ", 3);
     mPos += 3;
 
-    mPos += sprintf(mPos, "%ld", nPropVal);
+    mPos += sprintf(mPos, "%" SAL_PRIdINT64, nPropVal);
 }
 
 void JsonWriter::put(const char* pPropName, double fPropVal)