diff options
| -rw-r--r-- | include/numericbuilder.h | 2 | ||||
| -rw-r--r-- | make/common.pm | 8 | ||||
| -rw-r--r-- | src/coremods/core_ison.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_whois.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 12 |
5 files changed, 15 insertions, 11 deletions
diff --git a/include/numericbuilder.h b/include/numericbuilder.h index 9f4cfd7dd..36cfeedb4 100644 --- a/include/numericbuilder.h +++ b/include/numericbuilder.h @@ -113,7 +113,7 @@ class Numeric::Builder : public GenericBuilder<Sep, SendEmpty, WriteNumericSink> { public: Builder(LocalUser* user, unsigned int num, bool addparam = true, size_t additionalsize = 0) - : GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size()) + : Numeric::GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size()) { } }; diff --git a/make/common.pm b/make/common.pm index 638cc668a..f5bbedb3f 100644 --- a/make/common.pm +++ b/make/common.pm @@ -76,13 +76,13 @@ sub module_installed($) { sub get_cpu_count { my $count = 1; if ($^O =~ /bsd/) { - $count = `sysctl -n hw.ncpu`; + $count = `sysctl -n hw.ncpu 2>/dev/null` || 1; } elsif ($^O eq 'darwin') { - $count = `sysctl -n hw.activecpu`; + $count = `sysctl -n hw.activecpu 2>/dev/null` || 1; } elsif ($^O eq 'linux') { - $count = `getconf _NPROCESSORS_ONLN`; + $count = `getconf _NPROCESSORS_ONLN 2>/dev/null` || 1; } elsif ($^O eq 'solaris') { - $count = `psrinfo -p`; + $count = `psrinfo -p 2>/dev/null` || 1; } chomp($count); return $count; diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp index 8deeefc59..49da8931a 100644 --- a/src/coremods/core_ison.cpp +++ b/src/coremods/core_ison.cpp @@ -44,7 +44,7 @@ class IsonReplyBuilder : public Numeric::Builder<' ', true> { public: IsonReplyBuilder(LocalUser* user) - : Builder<' ', true>(user, 303) + : Numeric::Builder<' ', true>(user, 303) { } diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 703ebbed3..ecc406a8c 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -105,7 +105,7 @@ class WhoisChanListNumericBuilder : public Numeric::GenericBuilder<' ', false, W { public: WhoisChanListNumericBuilder(WhoisContextImpl& whois) - : GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, true, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1) + : Numeric::GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, true, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1) { } }; 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) |