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

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 && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 void dummy_can_throw_anything( char const * )
 {
 }
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
 #pragma GCC diagnostic pop
 #endif
 

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_MODIFY 0
 #define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0
 /* _Pragma */
 #define HAVE_GCC_PRAGMA_OPERATOR 0

configure.ac

@@ -5789,19 +5789,6 @@ if test "$GCC" = "yes"; then
         AC_MSG_RESULT([no])
     fi
 
-    AC_MSG_CHECKING(
-        [whether $CC supports pragma GCC diagnostic error/ignored/warning])
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -Wunknown-pragmas -Wunused-parameter"
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-            #pragma GCC diagnostic ignored "-Wunused-parameter"
-            void dummy(int n) {}
-        ])], [
-            AC_DEFINE([HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY],[1])
-            AC_MSG_RESULT([yes])
-        ], [AC_MSG_RESULT([no])])
-    CFLAGS=$save_CFLAGS
-
     AC_MSG_CHECKING([whether $CC supports pragma GCC diagnostic push/pop])
     save_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS -Werror -Wunknown-pragmas -Wunused-parameter"

connectivity/source/drivers/mozab/post_include_mozilla.h

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
     && !defined __clang__
 #pragma GCC diagnostic pop
 #elif defined _MSC_VER

connectivity/source/drivers/mozab/pre_include_mozilla.h

@@ -48,7 +48,7 @@
     #endif
 #endif
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
     && !defined __clang__
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"

connectivity/source/parse/sqlbison.y

@@ -51,7 +51,7 @@
 #pragma warning(disable:4273 4701)
 #endif
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#ifdef __GNUC__
 # pragma GCC diagnostic ignored "-Wwrite-strings"
 # pragma GCC diagnostic ignored "-Wunused-function"
 #endif

idlc/source/scanner.l

@@ -238,7 +238,7 @@ static void parseLineAndFile(sal_Char* pBuf)
 }	
 
 // Suppress any warnings from generated code:
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-label"
 #elif defined _MSC_VER

include/cppuhelper/propertysetmixin.hxx

@@ -80,7 +80,7 @@ template< typename T > class PropertySetMixin;
 
    @since UDK 3.2.1
 */
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
     && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
@@ -478,7 +478,7 @@ private:
     PropertySetMixin( const PropertySetMixin&); // not defined
     void operator=( const PropertySetMixin&); // not defined
 };
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
     && !defined __clang__
 #pragma GCC diagnostic pop
 #endif

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_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_OPERATOR
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && 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"))

l10ntools/source/cfglex.l

@@ -44,7 +44,7 @@
 
 #include "cfglex.hxx"
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#if __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-label"
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))

l10ntools/source/srclex.l

@@ -45,7 +45,7 @@
 
 #include "srclex.hxx"
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-label"
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))

l10ntools/source/xrmlex.l

@@ -43,7 +43,7 @@
 
 #include "sal/main.h"
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-label"
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))

rsc/source/parser/rscyacc.y

@@ -257,7 +257,7 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
 #pragma warning(push, 1)
 #pragma warning(disable:4129 4273 4701 4702)
 #endif
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #endif
 %}

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
 

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
 

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

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
 

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