Skip to content

M
mpd
Commit 7b2283c2 authored by François Revol's avatar François Revol
Browse files
Options

configure.ac: autodetect sin_len member in struct sockaddr_in.

This fixes a build issue on Haiku as it does have sin_len. Tested on Linux as well. For some reason AC_CHECK_MEMBER doesn't generate the proper define in config.h.in, so I used AC_CHECK_MEMBERS.
parent c74e0183
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
configure.ac
View file @ 7b2283c2
...@@ -243,6 +243,8 @@ AC_CHECK_FUNCS(fnmatch) ...@@ -243,6 +243,8 @@ AC_CHECK_FUNCS(fnmatch)
AC_CHECK_FUNCS(strndup) AC_CHECK_FUNCS(strndup)
AC_CHECK_FUNCS(strcasestr) AC_CHECK_FUNCS(strcasestr)
AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], [], [], [[#include <netinet/in.h>]])
if test x$host_is_linux = xyes; then if test x$host_is_linux = xyes; then
MPD_OPTIONAL_FUNC(eventfd, eventfd, USE_EVENTFD) MPD_OPTIONAL_FUNC(eventfd, eventfd, USE_EVENTFD)
MPD_OPTIONAL_FUNC(signalfd, signalfd, USE_SIGNALFD) MPD_OPTIONAL_FUNC(signalfd, signalfd, USE_SIGNALFD)
......
src/net/IPv4Address.hxx
View file @ 7b2283c2
...@@ -81,8 +81,7 @@ class IPv4Address { ...@@ -81,8 +81,7 @@ class IPv4Address {
static constexpr struct sockaddr_in Construct(struct in_addr address, static constexpr struct sockaddr_in Construct(struct in_addr address,
uint16_t port) { uint16_t port) {
return { return {
#if defined(__APPLE__) || \ #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
sizeof(struct sockaddr_in), sizeof(struct sockaddr_in),
#endif #endif
AF_INET, AF_INET,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment