mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 18:28:25 +00:00
Only define variable "a" if we HAVE_LINUX_NETWORK
Variable unsigned char a is defined unconditionally, but it is only used if HAVE_LINUX_NETWORK is defined. This triggers compiler warnings on, say, FreeBSD. Fix by wrapping the definition in proper #ifdef.
This commit is contained in:
committed by
Simon Kelley
parent
96bdb42d40
commit
1861a881eb
@@ -1939,11 +1939,14 @@ static void do_tcp_connection(struct listener *listener, time_t now, int slot)
|
|||||||
pid_t p;
|
pid_t p;
|
||||||
union mysockaddr tcp_addr;
|
union mysockaddr tcp_addr;
|
||||||
socklen_t tcp_len = sizeof(union mysockaddr);
|
socklen_t tcp_len = sizeof(union mysockaddr);
|
||||||
unsigned char a = 0, *buff;
|
unsigned char *buff;
|
||||||
struct server *s;
|
struct server *s;
|
||||||
int flags, auth_dns;
|
int flags, auth_dns;
|
||||||
struct in_addr netmask;
|
struct in_addr netmask;
|
||||||
int pipefd[2];
|
int pipefd[2];
|
||||||
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
|
unsigned char a = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
while ((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
|
while ((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
|
||||||
|
|
||||||
@@ -2052,7 +2055,7 @@ static void do_tcp_connection(struct listener *listener, time_t now, int slot)
|
|||||||
single byte comes back up the pipe, which
|
single byte comes back up the pipe, which
|
||||||
is sent by the child after it has closed the
|
is sent by the child after it has closed the
|
||||||
netlink socket. */
|
netlink socket. */
|
||||||
|
|
||||||
read_write(pipefd[0], &a, 1, RW_READ);
|
read_write(pipefd[0], &a, 1, RW_READ);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user