===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/canohost.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/ssh/canohost.h	2009/05/27 06:31:25	1.11
+++ src/usr.bin/ssh/canohost.h	2016/03/07 19:02:43	1.12
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */
+/* $OpenBSD: canohost.h,v 1.12 2016/03/07 19:02:43 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,16 +12,13 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-const char	*get_canonical_hostname(int);
-const char	*get_remote_ipaddr(void);
-const char	*get_remote_name_or_ip(u_int, int);
+#ifndef _CANOHOST_H
+#define _CANOHOST_H
 
 char		*get_peer_ipaddr(int);
 int		 get_peer_port(int);
 char		*get_local_ipaddr(int);
 char		*get_local_name(int);
+int		get_local_port(int);
 
-int		 get_remote_port(void);
-int		 get_local_port(void);
-int		 get_sock_port(int, int);
-void		 clear_cached_addr(void);
+#endif /* _CANOHOST_H */