diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-08-19 18:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 18:01:43 +0200 |
| commit | 2df0de3c9212f7ea74fcb9a0ccf20990e47e9f2e (patch) | |
| tree | 090b5c158e8d1669ed4d81bce6d3834ae9cf8bae | |
| parent | da04e0622c37d3d1ec6c3313fb5a82cbf9901329 (diff) | |
| parent | a6daa312e26532d68ffa70f6cf350baa5d43ca83 (diff) | |
Merge pull request #1200 from SaberUK/master+travis
Fix Travis builds on master.
| -rwxr-xr-x | make/unit-cc.pl | 5 | ||||
| -rw-r--r-- | src/modules/extra/m_ldap.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 8 | ||||
| -rw-r--r-- | src/socketengines/socketengine_poll.cpp | 4 | ||||
| -rwxr-xr-x | tools/travis-ci.sh | 1 |
5 files changed, 12 insertions, 8 deletions
diff --git a/make/unit-cc.pl b/make/unit-cc.pl index a06d7b10f..f04423ce3 100755 --- a/make/unit-cc.pl +++ b/make/unit-cc.pl @@ -80,18 +80,19 @@ sub do_static_find { sub do_static_link { my $execstr = "$ENV{CXX} -o $out $ENV{CORELDFLAGS}"; + my $link_flags = ''; for (@ARGV) { if (/\.cmd$/) { open F, '<', $_; my $libs = <F>; chomp $libs; - $execstr .= ' '.$libs; + $link_flags .= ' '.$libs; close F; } else { $execstr .= ' '.$_; } } - $execstr .= ' '.$ENV{LDLIBS}; + $execstr .= ' '.$ENV{LDLIBS}.' '.$link_flags; message 'LINK', $out, $execstr; exec $execstr; } diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index bf3809a24..698738145 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -27,7 +27,7 @@ # pragma comment(lib, "liblber.lib") #endif -/* $LinkerFlags: -lldap_r */ +/* $LinkerFlags: -lldap_r -llber */ class LDAPService; diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index d8dda27a4..e65a8de92 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -20,8 +20,12 @@ */ -/* Stop mysql wanting to use long long */ -#define NO_CLIENT_LONG_LONG +// Fix warnings about the use of `long long` on C++03. +#if defined __clang__ +# pragma clang diagnostic ignored "-Wc++11-long-long" +#elif defined __GNUC__ +# pragma GCC diagnostic ignored "-Wlong-long" +#endif #include "inspircd.h" #include <mysql.h> diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 5fd7e6235..59991d80d 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -168,7 +168,7 @@ int SocketEngine::DispatchEvents() int processed = 0; ServerInstance->UpdateTime(); - for (int index = 0; index < CurrentSetSize && processed < i; index++) + for (size_t index = 0; index < CurrentSetSize && processed < i; index++) { struct pollfd& pfd = events[index]; @@ -217,7 +217,7 @@ int SocketEngine::DispatchEvents() // The vector could've been resized, reference can be invalid by now; don't use it events[index].events = mask_to_poll(mask); - eh->eh->OnEventHandlerWrite(); + eh->OnEventHandlerWrite(); } } diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index 8828532b0..521d91e38 100755 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -16,4 +16,3 @@ fi set -e export TEST_BUILD_MODULES="m_geoip.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_openssl.cpp" ./tools/test-build $CXX -./run/bin/inspircd --version |