From 3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 2 Oct 2014 18:15:41 +0200 Subject: 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 --- vcl/unx/gtk/window/gloactiongroup.cxx | 8 ++++---- vcl/unx/gtk/window/glomenu.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl') diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index faffe197c88d..8cbc32622ce2 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 +#ifdef __GNUC__ #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 +#ifdef __GNUC__ #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 +#ifdef __GNUC__ #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 +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index 46bf91bbc763..780b6bfdab34 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 +#ifdef __GNUC__ #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 +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif -- cgit