From 8b5a86d4fda08a9c68231415812edcb26be52f79 Mon Sep 17 00:00:00 2001
From: roberto <roberto@FreeBSD.org>
Date: Thu, 28 Sep 2006 16:02:34 +0000
Subject: [PATCH] Fix compilation with gcc 4.1.  This is imported on the vendor
 branch as it was applied in the mainstream source and a later complete import
 of 4.2.2p3 will complete the fix.

Submitted by:	kan
---
 contrib/ntp/include/ntp_stdlib.h | 2 ++
 contrib/ntp/include/ntpd.h       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/contrib/ntp/include/ntp_stdlib.h b/contrib/ntp/include/ntp_stdlib.h
index 9d1d4c9bdcc0..3dc6fe041857 100644
--- a/contrib/ntp/include/ntp_stdlib.h
+++ b/contrib/ntp/include/ntp_stdlib.h
@@ -134,8 +134,10 @@ extern u_char *	cache_key;		/* key pointer */
 extern u_int	cache_keylen;		/* key length */
 
 /* clocktypes.c */
+#ifdef NTP_REFCLOCK_H
 struct clktype;
 extern struct clktype clktypes[];
+#endif
 
 /* getopt.c */
 extern char *	ntp_optarg;		/* global argument pointer */
diff --git a/contrib/ntp/include/ntpd.h b/contrib/ntp/include/ntpd.h
index cd3aad2d464d..54d3e13c24ee 100644
--- a/contrib/ntp/include/ntpd.h
+++ b/contrib/ntp/include/ntpd.h
@@ -226,8 +226,10 @@ extern int	config_priority;
 #endif
 
 /* ntp_control.c */
+#if 0
 struct ctl_trap;
 extern struct ctl_trap ctl_trap[];
+#endif
 extern int	num_ctl_traps;
 extern keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */