diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 18:15:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:18 +0200 |
| commit | 3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13 (patch) | |
| tree | 8b58bba8c42110e10f6763b598f294bf7359b1f0 /connectivity | |
| parent | 86cd29772e4f0571149c479378164572fbc96034 (diff) | |
remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro
This is supported in GCC 4.6.0 already:
https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html
Change-Id: I2f67e588eea3a323a2e9c81e39e56ab2e715a817
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/post_include_mozilla.h | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/pre_include_mozilla.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index c9abc5ed8d31..1570b011f0e7 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #elif defined _MSC_VER #pragma warning(pop) diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 1adce6e6d984..50afe572b309 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -48,8 +48,7 @@ #endif #endif -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #elif defined _MSC_VER |