diff options
| author |  Attila Molnar | 2016-08-19 18:01:43 +0200 |
|---|---|---|
| committer |  GitHub | 2016-08-19 18:01:43 +0200 |
| commit | 2df0de3c9212f7ea74fcb9a0ccf20990e47e9f2e (patch) | |
| tree | 090b5c158e8d1669ed4d81bce6d3834ae9cf8bae /src/modules | |
| parent | m_spanningtree Put command handlers with class names that collide with core c... (diff) | |
| parent | Fix m_mysql warning about use of C++11 features on C++03. (diff) | |
Merge pull request #1200 from SaberUK/master+travis
Fix Travis builds on master.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_ldap.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
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> |