0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes compilation on kfreebsd.

Browse source 
Fixes debian bug #626313. Thanks to Rhonda for testing the patch.
This commit is contained in:
Mark de Wever 2011-06-16 17:58:03 +00:00
parent 3ce7e68e92
commit 98e3c08f53
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -66,6 +66,7 @@ Version 1.9.6+svn:
* split optional comma-separated defines list from --preprocess= (or -p=)
to --preprocess-defines= option
* dropped --log alias for --log-error
* Fixed: Compilation on kfreebsd (Debian bug #626313)
Version 1.9.6:
* Campaigns:

34
src/network_worker.cpp
View file

@ -450,20 +450,28 @@ static SOCKET_STATE send_buffer(TCPsocket sock, std::vector<char>& buf, int in_s
}
#ifdef HAVE_SENDFILE
struct cork_setter {
cork_setter(int socket) : cork_(1), socket_(socket)
#ifdef TCP_CORK
struct cork_setter {
cork_setter(int socket) : cork_(1), socket_(socket)
{
setsockopt(socket_, IPPROTO_TCP, TCP_CORK, &cork_, sizeof(cork_));;
}
~cork_setter()
{
cork_ = 0;
setsockopt(socket_, IPPROTO_TCP, TCP_CORK, &cork_, sizeof(cork_));
}
private:
int cork_;
int socket_;
};
#else
struct cork_setter
{
setsockopt(socket_, IPPROTO_TCP, TCP_CORK, &cork_, sizeof(cork_));;
}
~cork_setter()
{
cork_ = 0;
setsockopt(socket_, IPPROTO_TCP, TCP_CORK, &cork_, sizeof(cork_));
}
private:
int cork_;
int socket_;
};
cork_setter(int) {}
};
#endif
struct close_fd {
void operator()(int fd) const { close(fd); }