Merge from http://moffetthome.net:8012/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge from http://moffetthome.net:8012/
manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML
xr8WQ8DdPkJ9DVsLjvsbhJU=
=O7Fd
-----END PGP SIGNATURE-----
--- a/mercurial/bdiff.c
+++ b/mercurial/bdiff.c
@@ -27,6 +27,7 @@ static uint32_t htonl(uint32_t x)
#else
#include <netinet/in.h>
#include <sys/types.h>
+ #include <stdint.h>
#endif
struct line {
--- a/mercurial/mpatch.c
+++ b/mercurial/mpatch.c
@@ -38,6 +38,7 @@ static uint32_t ntohl(uint32_t x)
#else
#include <netinet/in.h>
#include <sys/types.h>
+ #include <stdint.h>
#endif
static char mpatch_doc[] = "Efficient binary patching.";