From 4ab3cd653f3eb19ff82838f777984c9d16e64a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 15 Nov 2016 00:49:55 +0100 Subject: Fix some little compilation errors with some configs, from last commit --- CMakeLists.txt | 5 ----- louloulibs/network/tcp_client_socket_handler.cpp | 4 ++-- src/identd/identd_server.hpp | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10815b7..0faaf12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,11 +162,6 @@ file(GLOB source_identd add_library(identd STATIC ${source_identd}) target_link_libraries(identd bridge network utils src_utils logger) -if(USE_DATABASE) - target_link_libraries(xmpp database) - target_link_libraries(irc database) -endif() - # ## bridge # diff --git a/louloulibs/network/tcp_client_socket_handler.cpp b/louloulibs/network/tcp_client_socket_handler.cpp index dc9221d..2e90ea1 100644 --- a/louloulibs/network/tcp_client_socket_handler.cpp +++ b/louloulibs/network/tcp_client_socket_handler.cpp @@ -161,14 +161,14 @@ void TCPClientSocketHandler::connect(const std::string& address, const std::stri struct sockaddr_in6 a; socklen_t l = sizeof(a); if (::getsockname(this->socket, (struct sockaddr*)&a, &l) != -1) - this->local_port = ::ntohs(a.sin6_port); + this->local_port = ntohs(a.sin6_port); } else if (rp->ai_family == AF_INET) { struct sockaddr_in a; socklen_t l = sizeof(a); if (::getsockname(this->socket, (struct sockaddr*)&a, &l) != -1) - this->local_port = ::ntohs(a.sin_port); + this->local_port = ntohs(a.sin_port); } log_debug("Local port: ", this->local_port, ", and remote port: ", this->port); diff --git a/src/identd/identd_server.hpp b/src/identd/identd_server.hpp index 4270749..5f74976 100644 --- a/src/identd/identd_server.hpp +++ b/src/identd/identd_server.hpp @@ -2,6 +2,7 @@ #include #include +#include #include class BiboumiComponent; -- cgit v1.2.3