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 /ucb | |
| 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 'ucb')
| -rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonTypes.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index c04cd24eab0b..ec1cd8c0f94a 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -22,12 +22,12 @@ #include <stdio.h> #include <string.h> -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-function" #endif G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION); -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif diff --git a/ucb/source/ucp/webdav-neon/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx index 514bb969edec..b1748c3697a6 100644 --- a/ucb/source/ucp/webdav-neon/NeonTypes.hxx +++ b/ucb/source/ucp/webdav-neon/NeonTypes.hxx @@ -35,12 +35,12 @@ #include <ne_basic.h> #include <ne_props.h> -#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wshadow" #endif #include <ne_locks.h> -#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) # pragma GCC diagnostic pop #endif |