From: Willem Toorop <willem@NLnetLabs.nl>
Date: Thu, 1 Dec 2011 10:51:52 +0000 (+0000)
Subject: make lint now passes FreeBSD (at least when the source is compiled)
X-Git-Tag: release-1.6.12~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd0fc5e3ebd86803b7ba73fc9b51d1b7cc84afa7;p=thirdparty%2Fldns.git

make lint now passes FreeBSD (at least when the source is compiled)
---

diff --git a/Makefile.in b/Makefile.in
index e4de82bb..c6f69e30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ LINTFLAGS	+= "-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned i
 # compat with OpenBSD
 LINTFLAGS	+= "-Dsigset_t=long"
 # FreeBSD8
-LINTFLAGS	+= "-D__uint16_t=uint16_t" "-D__uint16_t=uint16_t" -D"__pure2=" -D"__wchar_t=wchar_t"
+LINTFLAGS	+= "-D__uint16_t=uint16_t" -D"__pure2=" -D"__wchar_t=wchar_t"
 # Ubuntu oneiric"
 LINTFLAGS       += -D"__BEGIN_DECLS=" -D"__ssize_t=ssize_t" -D"__intptr_t=intptr_t" -D"__nonnull(x)=" -D"__THROW=" -D"__wur=" -D"__off_t=unsigned" -D"__off64_t=unsigned" -D"__useconds_t=unsigned" -D"__uid_t=unsigned" -D"__gid_t=unsigned" -D"__attribute_deprecated__=" -D"__pid_t=unsigned" -D"__restrict=" -D"__END_DECLS=" -D"__BEGIN_NAMESPACE_STD=" -D"__END_NAMESPACE_STD=" -D"__BEGIN_NAMESPACE_C99=" -D"__END_NAMESPACE_C99="  -D"__socklen_t=unsigned" -D"sa_family_t=unsigned " -D"__mode_t=unsigned" -D"u_int16_t=uint16_t" -D"u_int32_t=uint32_t" -D"u_int8_t=uint8_t" -D"u_short=unsigned short" -D"__u16=uint16_t" -D"__u32=uint32_t"
 -D"__u64=uint64_t"
diff --git a/examples/ldns-testns.c b/examples/ldns-testns.c
index 100bfbb4..5b2f9232 100644
--- a/examples/ldns-testns.c
+++ b/examples/ldns-testns.c
@@ -367,9 +367,7 @@ static struct entry* entries;
 static void
 service(void)
 {
-#ifndef S_SPLINT_S
 	fd_set rset, wset, eset;
-#endif
 	struct timeval timeout;
 	int count;
 	int maxfd;
@@ -379,11 +377,13 @@ service(void)
 	timeout.tv_sec = 0;
 	timeout.tv_usec = 0;
 	while (1) {
+#ifndef S_SPLINT_S
 		FD_ZERO(&rset);
 		FD_ZERO(&wset);
 		FD_ZERO(&eset);
 		FD_SET(udp_sock, &rset);
 		FD_SET(tcp_sock, &rset);
+#endif
 		maxfd = udp_sock;
 		if(tcp_sock > maxfd)
 			maxfd = tcp_sock;