diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 17:54:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:17 +0200 |
| commit | 86cd29772e4f0571149c479378164572fbc96034 (patch) | |
| tree | 8f6334813634bbb4324c5be25cb43f6e13156d58 /connectivity | |
| parent | 78766aaa12ae4fae9dd2f3274617ba41de57eefd (diff) | |
remove HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY check and macro
This has been supported by GCC and clang for a very long time.
Change-Id: I410a2b39004c932003f8cbefe935aedb109b1163
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/post_include_mozilla.h | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/pre_include_mozilla.h | 2 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index 9bb7b6513313..c9abc5ed8d31 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ && !defined __clang__ #pragma GCC diagnostic pop #elif defined _MSC_VER diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 2168ce02b82e..1adce6e6d984 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -48,7 +48,7 @@ #endif #endif -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 89b524c924d3..e63bfe10c696 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -51,7 +51,7 @@ #pragma warning(disable:4273 4701) #endif -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wwrite-strings" # pragma GCC diagnostic ignored "-Wunused-function" #endif |