Fix conditional around closing #pragma GCC diagnostic pop

...which 7cf3574a "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@redhat.com>

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
         }

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);