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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit df5d1e47c33a8b9bf2b9783d5338f8432827a760
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Apr 29 12:35:40 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Apr 29 14:27:56 2019 +0200

    Fix conditional around closing #pragma GCC diagnostic pop
    
    ...which 7cf3574ac9208e70c03eeaca2def0235ec90f55f "Avoid
    -Werror=format/stringop-truncation" had failed to adapt
    
    Change-Id: Ide00c8136db27519c2d694576910c423d40d481e
    Reviewed-on: https://gerrit.libreoffice.org/71521
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index 1848067f14df..8950cb46fb67 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -74,7 +74,7 @@ void HWPStyle::SetName(int n, char const *name)
             auto const p = DATA[n].name;
             strncpy(p, name, MAXSTYLENAME);
             p[MAXSTYLENAME] = '\0'; // just in case, even though the array is zero-initialized
-#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 pop
 #endif
         }
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 27f20f40fb98..c95af5451b47 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -249,7 +249,7 @@ int issymbolic(char *dir, char *component)
     // silence "‘snprintf’ output may be truncated before the last format character"
 #endif
     int n = snprintf(buf, BUFSIZ, "%s%s%s", dir, *dir ? "/" : "", component);
-#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 pop
 #endif
     assert(n < BUFSIZ);