Fix breakage of ipset on *BSD.

Regression introduced in 98189ff988

Thanks to Harper Andrews for spotting this.
This commit is contained in:
Simon Kelley
2025-06-20 15:48:47 +01:00
parent a444715bf0
commit 2b19285724
3 changed files with 12 additions and 3 deletions

View File

@@ -349,7 +349,6 @@ HAVE_SOCKADDR_SA_LEN
#endif
#if !defined(HAVE_LINUX_NETWORK)
#undef HAVE_IPSET
#undef HAVE_NFTSET
#endif
@@ -357,6 +356,16 @@ HAVE_SOCKADDR_SA_LEN
#undef HAVE_IPSET
#endif
#if defined(HAVE_IPSET)
# if defined(HAVE_LINUX_NETWORK)
# define HAVE_LINUX_IPSET
# elif defined(HAVE_BSD_NETWORK)
# define HAVE_BSD_IPSET
# else
# undef HAVE_IPSET
# endif
#endif
#ifdef NO_LOOP
#undef HAVE_LOOP
#endif

View File

@@ -16,7 +16,7 @@
#include "dnsmasq.h"
#if defined(HAVE_IPSET)
#if defined(HAVE_LINUX_IPSET)
#include <string.h>
#include <errno.h>

View File

@@ -18,7 +18,7 @@
#include "dnsmasq.h"
#if defined(HAVE_IPSET) && defined(HAVE_BSD_NETWORK)
#if defined(HAVE_BSD_IPSET)
#include <string.h>