diff options
| author | Peter Powell <petpow@saberuk.com> | 2018-10-26 01:18:54 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2018-10-26 01:20:35 +0100 |
| commit | 2d50984185c7902d37783a98f19637c86694a452 (patch) | |
| tree | 58b599ebbc761d3011e266aeaaa1a0f5612fe449 /src/modules | |
| parent | 2b4682c2d1458377faa97ded0345d740ece31c66 (diff) | |
Fix a bunch of harmless compiler warnings on recent GCC releases.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_geoip.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_httpd.cpp | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index 6272a5c24..e4299a1c2 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -34,7 +34,11 @@ #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" #elif defined __GNUC__ -# pragma GCC diagnostic ignored "-pedantic" +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) +# pragma GCC diagnostic ignored "-Wpedantic" +# else +# pragma GCC diagnostic ignored "-pedantic" +# endif #endif #include <GeoIP.h> diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 8bd73b2bb..f5711cbd7 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -41,7 +41,9 @@ #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" #elif defined __GNUC__ -# if __GNUC__ < 6 +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) +# pragma GCC diagnostic ignored "-Wpedantic" +# else # pragma GCC diagnostic ignored "-pedantic" # endif #endif diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index f67f4cb81..3a0d4f861 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -32,7 +32,11 @@ #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" #elif defined __GNUC__ -# pragma GCC diagnostic ignored "-pedantic" +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) +# pragma GCC diagnostic ignored "-Wpedantic" +# else +# pragma GCC diagnostic ignored "-pedantic" +# endif #endif // Fix warnings about shadowing in http_parser. |