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 /ucb | |
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 'ucb')
-rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonUri.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 6d7bc63a45e9..c04cd24eab0b 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 && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #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 && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #pragma GCC diagnostic pop #endif diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 31327d3e86d4..d378cfb46ddf 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -43,7 +43,7 @@ using namespace webdav_ucp; // FIXME: not sure whether initializing a ne_uri statically is supposed to work // the string fields of ne_uri are char*, not const char* -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wwrite-strings" #endif |