3 files changed, 3 insertions(+), 7 deletions(-)

M CMakeLists.txt
M louloulibs/network/tcp_client_socket_handler.cpp
M src/identd/identd_server.hpp

@@ 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
 #

@@ 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);

@@ 2,6 2,7 @@
 
 #include <network/tcp_server_socket.hpp>
 #include <identd/identd_socket.hpp>
+#include <algorithm>
 #include <unistd.h>
 
 class BiboumiComponent;