From 99e4fedcd3e7f07f2c4a8e28b1da50c04206b582 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 26 Mar 2015 02:42:26 +0000 Subject: [PATCH] Guard kernel_accepts_extra_sockaddr_bytes in defined(IPv6) --- similar/main/net_udp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 8c3df7a18..b26ed67e9 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -269,11 +269,12 @@ static bool convert_text_portstring(const char *portstring, uint16_t &outport, b namespace { +#ifdef IPv6 /* Returns true if kernel allows specifying sizeof(sockaddr_in6) for * size of a sockaddr_in. Saves a compare+jump in application code to * pass sizeof(sockaddr_in6) and let kernel sort it out. */ -static inline constexpr bool kernel_accepts_extra_sockaddr_bytes() +static constexpr bool kernel_accepts_extra_sockaddr_bytes() { #if defined(__linux__) /* Known to work */ @@ -283,6 +284,7 @@ static inline constexpr bool kernel_accepts_extra_sockaddr_bytes() return false; #endif } +#endif /* Forward to static function to eliminate this pointer */ template