diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-02-20 16:29:55 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-02-20 16:29:55 +0100 |
| commit | 0cfe4a848b06d8b8b277a7afc90ceabcaa50d9fa (patch) | |
| tree | 3d7a014f302e9e5a6c7e92e970f0fafd71a6ed77 /src/modules/extra | |
| parent | 14b220b8d322146e1fc2393640b4292b4be1257b (diff) | |
| parent | 7e767774b496c13677a488c17cf46223655b19fb (diff) | |
Merge pull request #1142 from SaberUK/master+fixes
Fix various build problems on CentOS, OpenBSD, and Solaris.
Diffstat (limited to 'src/modules/extra')
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 10b97b359..8d786cc3f 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -28,8 +28,12 @@ // Fix warnings about the use of commas at end of enumerator lists on C++03. #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" -#elif defined __GNUC__ && __GNUC__ < 6 -# pragma GCC diagnostic ignored "-pedantic" +#elif defined __GNUC__ +# if __GNUC__ < 6 +# pragma GCC diagnostic ignored "-pedantic" +# else +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# endif #endif #include <gnutls/gnutls.h> @@ -58,8 +62,8 @@ # pragma comment(lib, "libgnutls-28.lib") #endif -/* $CompileFlags: -std=c++03 pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ -/* $LinkerFlags: -std=c++03 rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ +/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ +/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ // These don't exist in older GnuTLS versions #if INSPIRCD_GNUTLS_HAS_VERSION(2, 1, 7) |