Merge pull request #1200 from SaberUK/master+travis

Fix Travis builds on master.

3 files changed, 9 insertions, 5 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>
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();
 		}
 	}