cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 13:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Build correctly on platforms without sockaddr_storage

Browse Source
This commit is contained in:
Nick Mathewson 2011-01-24 18:29:20 -05:00
parent 453317b28c
commit 9184563e49
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -443,7 +443,7 @@ AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(size_t)
AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(void *)
AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo], , , AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo, struct sockaddr_storage], , ,
[#define _GNU_SOURCE [#define _GNU_SOURCE
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H

17
util-internal.h
View File

@ -205,6 +205,23 @@ long _evutil_weakrand(void);
#define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond) #define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond)
#endif #endif
#ifndef _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE
/* Replacement for sockaddr storage that we can use internally on platforms
* that lack it. It is not space-efficient, but neither is sockaddr_storage.
*/
struct sockaddr_storage {
union {
struct sockaddr ss_sa;
struct sockaddr_in ss_sin;
#ifdef _EVENT_HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 ss_sin6;
#endif
char ss_padding[128];
} ss_union;
};
#define ss_family ss_union.ss_sa.sa_family
#endif
/* Internal addrinfo error code. This one is returned from only from /* Internal addrinfo error code. This one is returned from only from
* evutil_getaddrinfo_common, when we are sure that we'll have to hit a DNS * evutil_getaddrinfo_common, when we are sure that we'll have to hit a DNS
* server. */ * server. */