]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
[ipfire-2.x.git] / src / patches / dnsmasq / 0003-Debian-build-fixes-for-kFreeBSD.patch
1 From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Fri, 3 Oct 2014 08:48:11 +0100
4 Subject: [PATCH 03/71] Debian build fixes for kFreeBSD
5
6 ---
7 src/tables.c | 6 +++++-
8 1 file changed, 5 insertions(+), 1 deletion(-)
9
10 diff --git a/src/tables.c b/src/tables.c
11 index 834f11944cd0..dcdef794c4d2 100644
12 --- a/src/tables.c
13 +++ b/src/tables.c
14 @@ -20,6 +20,10 @@
15
16 #if defined(HAVE_IPSET) && defined(HAVE_BSD_NETWORK)
17
18 +#ifndef __FreeBSD__
19 +#include <bsd/string.h>
20 +#endif
21 +
22 #include <sys/types.h>
23 #include <sys/ioctl.h>
24
25 @@ -136,7 +140,7 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr,
26 return -1;
27 }
28
29 - if (rc = pfr_add_tables(&table, 1, &n, 0))
30 + if ((rc = pfr_add_tables(&table, 1, &n, 0)))
31 {
32 my_syslog(LOG_WARNING, _("warning: pfr_add_tables: %s(%d)"),
33 pfr_strerror(errno),rc);
34 --
35 2.1.0
36