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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/osx/printaccessoryview.mm | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gloactiongroup.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/glomenu.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm index 56f6ab022f06..e2db4c3fe443 100644 --- a/vcl/osx/printaccessoryview.mm +++ b/vcl/osx/printaccessoryview.mm @@ -1084,7 +1084,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO // Make deprecation warnings just warnings in a -Werror compilation. -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#ifdef __GNUC__ // #pragma GCC diagnostic push #pragma GCC diagnostic warning "-Wdeprecated-declarations" #endif diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 60f46cd7f45f..faffe197c88d 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -39,12 +39,12 @@ struct _GLOAction typedef GObjectClass GLOActionClass; typedef struct _GLOAction GLOAction; -#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 (GLOAction, g_lo_action, G_TYPE_OBJECT); -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #pragma GCC diagnostic pop #endif @@ -106,7 +106,7 @@ struct _GLOActionGroupPrivate static void g_lo_action_group_iface_init (GActionGroupInterface *); -#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 @@ -114,7 +114,7 @@ G_DEFINE_TYPE_WITH_CODE (GLOActionGroup, g_lo_action_group, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, g_lo_action_group_iface_init)); -#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/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index 76c617bead13..46bf91bbc763 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -25,12 +25,12 @@ struct _GLOMenu typedef GMenuModelClass GLOMenuClass; -#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 (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL); -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #pragma GCC diagnostic pop #endif |