Permalink
Browse files

Don't use s_addr as parameter name. Fixes compiling with Solaris.

Signed-off-by: Timo Sirainen <tss@iki.fi>
  • Loading branch information...
1 parent 0c5307f commit 620152261e64d6080024355409f22aa4a8236fd6 @sirainen sirainen committed with keithw Aug 11, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/network/network.cc
  2. +1 −1 src/network/network.h
View
4 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;
View
2 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;

0 comments on commit 6201522

Please sign in to comment.