From: Dave Hart <hart@ntp.org>
Date: Sat, 7 Feb 2009 00:05:41 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/hart/ntp-stable-dprintf
X-Git-Tag: NTP_4_2_5P160~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b551aea0b1c4edd1eff52ad579c11831849bcfed;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/hart/ntp-stable-dprintf
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-dprintf

bk: 498cd055kXpez70jjFxQ-27WUT8evw
---

b551aea0b1c4edd1eff52ad579c11831849bcfed
diff --cc ntpd/ntp_io.c
index 34892f075,a13b6747e..80c446756
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -224,10 -191,10 +224,10 @@@ static	isc_boolean_t	socket_multicast_d
  #endif
  
  #ifdef DEBUG
 -static void print_interface	P((struct interface *, char *, char *));
 +static void print_interface	(struct interface *, char *, char *);
  #define DPRINT_INTERFACE(_LVL_, _ARGS_) do { if (debug >= (_LVL_)) { print_interface _ARGS_; } } while (0)
  #else
- #define DPRINT_INTERFACE(_LVL_, _ARGS_)
+ #define DPRINT_INTERFACE(_LVL_, _ARGS_) do {} while (0)
  #endif
  
  typedef struct vsock vsock_t;
@@@ -3379,10 -3205,9 +3379,10 @@@ findlocalinterface
  	struct sockaddr_storage saddr;
  	GETSOCKNAME_SOCKLEN_TYPE saddrlen = SOCKLEN(addr);
  	struct interface *iface;
 +	int on = 1;
  
  	DPRINTF(4, ("Finding interface for addr %s in list of addresses\n",
- 		    stoa(addr));)
+ 		    stoa(addr)));
  
  	memset(&saddr, 0, sizeof(saddr));
  	saddr.ss_family = addr->ss_family;