diff options
| author | louiz’ <louiz@louiz.org> | 2016-11-15 00:49:55 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2016-11-15 00:49:55 +0100 |
| commit | 4ab3cd653f3eb19ff82838f777984c9d16e64a80 (patch) | |
| tree | fd11fe72ee6961f7a9537c5ad403dff44db7325d | |
| parent | d872c2b49214c0a4db40a9e2d860802d9eedc563 (diff) | |
| download | biboumi-4ab3cd653f3eb19ff82838f777984c9d16e64a80.tar.gz biboumi-4ab3cd653f3eb19ff82838f777984c9d16e64a80.tar.bz2 biboumi-4ab3cd653f3eb19ff82838f777984c9d16e64a80.tar.xz biboumi-4ab3cd653f3eb19ff82838f777984c9d16e64a80.zip | |
Fix some little compilation errors with some configs, from last commit
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | louloulibs/network/tcp_client_socket_handler.cpp | 4 | ||||
| -rw-r--r-- | 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 <network/tcp_server_socket.hpp> #include <identd/identd_socket.hpp> +#include <algorithm> #include <unistd.h> class BiboumiComponent; |