[Libreoffice-commits] core.git: hwpfilter/source soltools/mkdepend

[Julien Nabet (via logerrit)]

 hwpfilter/source/hstyle.cxx |    2 +-
 soltools/mkdepend/include.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7cf3574ac9208e70c03eeaca2def0235ec90f55f
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Apr 28 16:03:10 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Apr 29 09:11:26 2019 +0200

    Avoid -Werror=format/stringop-truncation
    
    It also affects gcc 8.3
    
    Change-Id: I896e84d5e1e96abfe81294e921cfcc060e44fb6f
    Reviewed-on: https://gerrit.libreoffice.org/71474
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index 87fd1efbe978..1848067f14df 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -67,7 +67,7 @@ void HWPStyle::SetName(int n, char const *name)
     {
         if (name)
         {
-#if defined __GNUC__ && __GNUC__ == 8 && __GNUC_MINOR__ == 2 && !defined __clang__
+#if defined __GNUC__ && __GNUC__ == 8 && (__GNUC_MINOR__ == 2 || __GNUC_MINOR__ == 3) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 4af7c47248e5..27f20f40fb98 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -243,7 +243,7 @@ int issymbolic(char *dir, char *component)
     struct stat st;
     char    buf[ BUFSIZ ], **pp;
 
-#if defined __GNUC__ && __GNUC__ == 8 && __GNUC_MINOR__ == 2 && !defined __clang__
+#if defined __GNUC__ && __GNUC__ == 8 && (__GNUC_MINOR__ == 2 || __GNUC_MINOR__ == 3) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
     // silence "‘snprintf’ output may be truncated before the last format character"