transmission-2.51 missing 2 #include's for FreeBSD compability

[samuli]

transmission-2.51 is failing to compile on a FreeBSD system because of 2 missing #include lines

build log of the failure:

​http://bugs.gentoo.org/attachment.cgi?id=312311

the patch that fixes the above build failure:

​http://bugs.gentoo.org/attachment.cgi?id=311957

--- third-party/libutp/utp.h +++ third-party/libutp/utp.h @@ -12,7 +12,9 @@

#pragma comment(lib,"ws2_32.lib") #else #include <stdlib.h>

+#include <sys/types.h>

#include <sys/socket.h>

+#include <netinet/in.h>

the downstream bug report:

​http://bugs.gentoo.org/400929

alternative patch from official FreeBSD for the same issue:

​http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-p2p/transmission-cli/files/patch-third-party_libutp_utp.cpp?rev=1.1

-- third-party/libutp/utp.cpp.orig 2011-04-29 21:45:38.000000000 -0500 +++ third-party/libutp/utp.cpp 2011-04-29 21:47:05.000000000 -0500 @@ -10,6 +10,9 @@

#include <stdlib.h> #include <errno.h> #include <limits.h> for UINT_MAX

+#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h>

I'll attach these files here too...

[samuli]

build log

[samuli]

Gentoo/FreeBSD build patch

[samuli]

Patch from FreeBSD for same issue

[jordan]

Thanks for reporting this issue, but it looks to me like this ought to be handled upstream. Could you file a ticket at ​https://github.com/bittorrent/libutp?

[samuli]

Reported it here:

​http://github.com/bittorrent/libutp/issues/35

[samuli]

The patch was merged to utp git.

[livings124]

Fixed in r13317. Thanks!

[rb07]

Replying to livings124:

Fixed in r13317. Thanks!

Your changes in Mac OSX are leaving the file with Mac OSX line termination (^M^J or \r\n), this causes svn to see most of the file as different (on Linux).