From 620152261e64d6080024355409f22aa4a8236fd6 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 11 Aug 2012 23:12:31 +0300 Subject: [PATCH] Don't use s_addr as parameter name. Fixes compiling with Solaris. Signed-off-by: Timo Sirainen --- src/network/network.cc | 4 ++-- src/network/network.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/network.cc b/src/network/network.cc index c3430d1..2e9db55 100644 --- a/src/network/network.cc +++ b/src/network/network.cc @@ -211,11 +211,11 @@ Connection::Connection( const char *desired_ip, const char *desired_port ) /* se throw NetworkException( "Could not bind", errno ); } -bool Connection::try_bind( int socket, uint32_t s_addr, int port ) +bool Connection::try_bind( int socket, uint32_t addr, int port ) { struct sockaddr_in local_addr; local_addr.sin_family = AF_INET; - local_addr.sin_addr.s_addr = s_addr; + local_addr.sin_addr.s_addr = addr; int search_low = PORT_RANGE_LOW, search_high = PORT_RANGE_HIGH; diff --git a/src/network/network.h b/src/network/network.h index 68e4f3a..5219f27 100644 --- a/src/network/network.h +++ b/src/network/network.h @@ -91,7 +91,7 @@ namespace Network { static const int PORT_RANGE_LOW = 60001; static const int PORT_RANGE_HIGH = 60999; - static bool try_bind( int socket, uint32_t s_addr, int port ); + static bool try_bind( int socket, uint32_t addr, int port ); int sock; bool has_remote_addr;