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

Fixed compilation on all Debian architectures.

Browse source 
The #undef was introduced in 2010-10-31T09:00:17Z!guillaume.melquiond@gmail.com, but the commit offers no reason
_why_ the macro was undefined. This patch has been tested by Rhonda on
all Debian architectures and there it caused no build problem, whereas
the 2010-10-31T09:00:17Z!guillaume.melquiond@gmail.com caused several architectures failing to build.

The reason the issue was spotted much later is that before Debian
compiled with the ANA network. It switched to the older network code
while changing the build system from autotools to cmake, so the latter
was thought to be the cause.

Fixes Debian bug #636193 and reverts 2010-10-31T09:00:17Z!guillaume.melquiond@gmail.com.
This commit is contained in:
Mark de Wever 2011-09-10 16:13:22 +00:00
parent 58f36829ef
commit ed85e86e77
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -11,7 +11,8 @@ Version 1.9.9+svn:
* Removed waypoints UI feature
* WML engine:
* Readded the liminal alignment
* Miscellaneous and bug fixes:
* Fixed compilation on all Debian architectures (Debian bug #636193)
Version 1.9.9:
* AI:

1
src/network_worker.cpp
View file

@ -599,7 +599,6 @@ static SOCKET_STATE receive_buf(TCPsocket sock, std::vector<char>& buf)
return SOCKET_ERRORED;
}
#undef SDLNet_Read32
const int len = SDLNet_Read32(reinterpret_cast<void*>(num_buf));
if(len < 1 || len > 100000000) {