diff options
-rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 4 | ||||
-rw-r--r-- | config_host/config_global.h.in | 1 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/post_include_mozilla.h | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/pre_include_mozilla.h | 3 | ||||
-rw-r--r-- | external/boost/boost.wdeprecated-auto_ptr.patch.0 | 59 | ||||
-rw-r--r-- | external/boost/boost_1_44_0-clang-warnings.patch | 21 | ||||
-rw-r--r-- | external/clucene/patches/clucene-warnings.patch | 20 | ||||
-rw-r--r-- | include/cppuhelper/propertysetmixin.hxx | 6 | ||||
-rw-r--r-- | include/sal/types.h | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonTypes.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gloactiongroup.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/window/glomenu.cxx | 4 |
15 files changed, 61 insertions, 96 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 50a973f49b03..56f9bac9f808 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -94,14 +94,14 @@ std::type_info * createFake_si_class_type_info( } -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-function" #endif void dummy_can_throw_anything( char const * ) { } -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index 197f2c0fd9d3..ee0514267633 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -17,7 +17,6 @@ Any change in this header will cause a rebuild of almost everything. #define HAVE_CXX11_FINAL 0 #define HAVE_CXX11_PERFECT_FORWARDING 0 #define HAVE_GCC_BUILTIN_ATOMIC 0 -#define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0 /* _Pragma */ #define HAVE_GCC_PRAGMA_OPERATOR 0 #define HAVE_GCC_DEPRECATED_MESSAGE 0 diff --git a/configure.ac b/configure.ac index 44ee065d2a58..f14180a5e5f7 100644 --- a/configure.ac +++ b/configure.ac @@ -5789,20 +5789,6 @@ if test "$GCC" = "yes"; then AC_MSG_RESULT([no]) fi - AC_MSG_CHECKING([whether $CC supports pragma GCC diagnostic push/pop]) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -Wunknown-pragmas -Wunused-parameter" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-parameter" - void dummy(int n) {} - #pragma GCC diagnostic pop - ])], [ - AC_DEFINE([HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE],[1]) - AC_MSG_RESULT([yes]) - ], [AC_MSG_RESULT([no])]) - CFLAGS=$save_CFLAGS - AC_MSG_CHECKING([whether $CC supports __attribute__((deprecated(message)))]) save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror" diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index c9abc5ed8d31..1570b011f0e7 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #elif defined _MSC_VER #pragma warning(pop) diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 1adce6e6d984..50afe572b309 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -48,8 +48,7 @@ #endif #endif -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #elif defined _MSC_VER diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0 index 959cb13a6f77..9be0eea1c993 100644 --- a/external/boost/boost.wdeprecated-auto_ptr.patch.0 +++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0 @@ -1,11 +1,10 @@ --- boost/ptr_container/ptr_map.hpp +++ boost/ptr_container/ptr_map.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ # pragma once #endif -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -17,19 +16,18 @@ } -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif --- boost/ptr_container/ptr_map_adapter.hpp +++ boost/ptr_container/ptr_map_adapter.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ # pragma once #endif -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -41,19 +39,18 @@ } // namespace 'boost' -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif --- boost/ptr_container/ptr_set_adapter.hpp +++ boost/ptr_container/ptr_set_adapter.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ # pragma once #endif -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -65,19 +62,18 @@ } // namespace 'boost' -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif --- boost/ptr_container/ptr_sequence_adapter.hpp +++ boost/ptr_container/ptr_sequence_adapter.hpp -@@ -16,6 +16,11 @@ +@@ -16,6 +16,10 @@ # pragma once #endif -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -88,19 +84,18 @@ } // namespace 'boost' -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif --- boost/ptr_container/ptr_vector.hpp +++ boost/ptr_container/ptr_vector.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ # pragma once #endif -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -112,19 +107,18 @@ } -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif --- boost/smart_ptr/detail/shared_count.hpp +++ boost/smart_ptr/detail/shared_count.hpp -@@ -18,6 +18,12 @@ +@@ -18,6 +18,11 @@ // http://www.boost.org/LICENSE_1_0.txt) // -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -136,19 +130,18 @@ # pragma warn .8027 // Functions containing try are not expanded inline #endif -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED --- boost/smart_ptr/scoped_ptr.hpp +++ boost/smart_ptr/scoped_ptr.hpp -@@ -11,6 +11,12 @@ +@@ -11,6 +11,11 @@ // http://www.boost.org/libs/smart_ptr/scoped_ptr.htm // -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -160,19 +153,18 @@ } // namespace boost -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED --- boost/smart_ptr/shared_ptr.hpp +++ boost/smart_ptr/shared_ptr.hpp -@@ -14,6 +14,12 @@ +@@ -14,6 +14,11 @@ // See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif @@ -180,12 +172,11 @@ #include <boost/config.hpp> // for broken compiler workarounds #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) -@@ -1036,4 +1036,9 @@ +@@ -1036,4 +1036,8 @@ #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch index d5b934b5f0ec..a71cc2f5a890 100644 --- a/external/boost/boost_1_44_0-clang-warnings.patch +++ b/external/boost/boost_1_44_0-clang-warnings.patch @@ -1,11 +1,10 @@ --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp +++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -17,19 +16,18 @@ } // namespace boost -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP --- misc/boost_1_44_0/boost/random/shuffle_output.hpp +++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -41,19 +39,18 @@ } } -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp +++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -65,7 +62,7 @@ } // namespace random } // namespace boost -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index 5f602c2ffa1c..dc20d198170c 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -5,7 +5,7 @@ #define _lucene_analysis_AnalysisHeader_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -18,7 +18,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -29,7 +29,7 @@ #define _lucene_search_Searcher_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -42,7 +42,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -53,7 +53,7 @@ #define _lucene_store_IndexInput_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -66,7 +66,7 @@ }; CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -77,7 +77,7 @@ #define _lucene_util_Array_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wunused-parameter" @@ -91,7 +91,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -102,7 +102,7 @@ #define _lucene_util_PriorityQueue_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -115,7 +115,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 446ae22a911e..73df16550951 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -80,8 +80,7 @@ template< typename T > class PropertySetMixin; @since UDK 3.2.1 */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif @@ -478,8 +477,7 @@ private: PropertySetMixin( const PropertySetMixin&); // not defined void operator=( const PropertySetMixin&); // not defined }; -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif diff --git a/include/sal/types.h b/include/sal/types.h index 56d6e15bd5b2..e77407b8355b 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -497,7 +497,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { SAL_WNODEPRECATED_DECLARATIONS_POP */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_OPERATOR +#if HAVE_GCC_PRAGMA_OPERATOR #define SAL_WNODEPRECATED_DECLARATIONS_PUSH \ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored "-Wdeprecated-declarations")) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 067a132f0be4..a1fe93121f2f 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -23,10 +23,8 @@ #include <sal/types.h> #if defined __GNUC__ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-parameter" -#endif #elif defined _MSC_VER #pragma warning(push, 1) #endif @@ -41,9 +39,7 @@ #include "PDFDoc.h" #if defined __GNUC__ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE # pragma GCC diagnostic pop -#endif #elif defined _MSC_VER #pragma warning(pop) #endif 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 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 |