fix a merge conflict

bk: 482fefdduu31fB-O33REmjUXnFlOHA

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 06b59c959718a705e15706787922a7f7b6885ef4..242fae6878781d72ac2864cda91f33afd5eb098d 100644 (file)
--- 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 *);