diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-12 15:34:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-13 08:28:13 +0200 |
| commit | ab3eabe438880d6c0fc7dab99a8537d873da3f05 (patch) | |
| tree | 5120d084413fe062e141765ac2f8391cd25c5683 /jvmfwk | |
| parent | 08a7b88a0877d6fd753fe8ab4532d9da527d21c6 (diff) | |
gcc 10 also generates this clobber warning
(specifically 10.1.1 is the version I have)
Change-Id: I40fd720a9a75b809f24ca135c4ddb0ce61ecbe41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94056
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 4760ab629313..c754dbe7c9cb 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -818,12 +818,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #endif return errorcode; -#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wclobbered" #endif } -#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ #pragma GCC diagnostic pop #endif |