From fa545023ada3f2a5f79cab1ff628fd18434c7c2e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 23 Mar 2013 21:55:27 +0100 Subject: Introduce HAVE_GCC_PRAGMA_DIAGNOSTIC_{MODIFY,SCOPE} ...replacing hard-coded GCC version checks. Those checks that guard #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" appear relevant only for GCC itself, not Clang (which used to fail the old guards because it typically announces itself with a rather low __GNUC__/__GNUC_MINOR__ version), see 6e67c03dc0225fc66343546b14e902b9d238b1a3 "Enable -Wnon-virtual-dtor for GCC 4.6" Change-Id: I6bfa4d5caa6192e7a203ce829682bf6bb8d61a1b --- idlc/source/scanner.l | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'idlc') diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 4c123ea8f0c3..166c281fefd1 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -23,6 +23,8 @@ * scanner.ll - Lexical scanner for IDLC 1.0 */ +#include "sal/config.h" + #include #include #include @@ -247,11 +249,9 @@ static void parseLineAndFile(sal_Char* pBuf) } // Suppress any warnings from generated code: -#if defined __GNUC__ -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" -#endif #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER -- cgit v1.2.3