Merge branch 'master' into extra_locators_merge

This commit is contained in:
Gioacchino Mazzurco 2018-07-02 12:22:23 +02:00
commit 1dd707710b
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
241 changed files with 20454 additions and 3066 deletions

View file

@ -58,6 +58,15 @@ int inet_aton(const char *name, struct in_addr *addr);
#endif
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
/**
* Workaround for binary compatibility between Windows XP (which miss
* IPV6_V6ONLY define), and newer Windows that has it.
* @see http://lua-users.org/lists/lua-l/2013-04/msg00191.html
*/
#ifndef IPV6_V6ONLY
# define IPV6_V6ONLY 27
#endif
/* 64 bit conversions */
#ifndef ntohll
uint64_t ntohll(uint64_t x);