From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 May 2008 08:59:09 +0000 (-0400)
Subject: fix a merge conflict
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0abd20085cc166bfb3776083c818cec568738e34;p=thirdparty%2Fntp.git

fix a merge conflict

bk: 482fefdduu31fB-O33REmjUXnFlOHA
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 06b59c9597..242fae6878 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -205,7 +205,7 @@ static  u_char          sys_interphase = 0;
 
 static  struct interface *new_interface (struct interface *);
 static  void add_interface (struct interface *);
-static  void update_interfaces (u_short, interface_receiver_t, void *);
+static  int update_interfaces (u_short, interface_receiver_t, void *);
 static  void remove_interface (struct interface *);
 static  struct interface *create_interface (u_short, struct interface *);