From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 20 Jul 2005 01:20:36 +0000 (-0400)
Subject: [Bug 466] Fix compilation under gcc4
X-Git-Tag: NTP_4_2_0B_RC1~11^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed19a2f93d96ac9e9742f2148588991386084bdd;p=thirdparty%2Fntp.git

[Bug 466] Fix compilation under gcc4

bk: 42dda6e41DRfu8CtPFm86HEC_V0vjg
---

diff --git a/include/ntp_control.h b/include/ntp_control.h
index 86f38100e..46c9a7003 100644
--- a/include/ntp_control.h
+++ b/include/ntp_control.h
@@ -268,6 +268,7 @@ struct ctl_trap {
 	u_char tr_flags;		/* trap flags */
 	u_char tr_version;		/* version number of trapper */
 };
+extern struct ctl_trap ctl_trap[];
 
 /*
  * Flag bits
diff --git a/include/ntp_refclock.h b/include/ntp_refclock.h
index 5e33a8ce2..112c4e372 100644
--- a/include/ntp_refclock.h
+++ b/include/ntp_refclock.h
@@ -65,6 +65,7 @@ struct clktype {
 	const char *clocktype;	/* long description */
 	const char *abbrev;	/* short description */
 };
+extern struct clktype clktypes[];
 
 /*
  * Configuration flag values
diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h
index 9d1d4c9bd..9d3a741dc 100644
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -133,10 +133,6 @@ extern keyid_t	cache_keyid;		/* key identifier */
 extern u_char *	cache_key;		/* key pointer */
 extern u_int	cache_keylen;		/* key length */
 
-/* clocktypes.c */
-struct clktype;
-extern struct clktype clktypes[];
-
 /* getopt.c */
 extern char *	ntp_optarg;		/* global argument pointer */
 extern int	ntp_optind;		/* global argv index */
diff --git a/include/ntpd.h b/include/ntpd.h
index a789d0f9c..90a274921 100644
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -225,8 +225,6 @@ extern int	config_priority;
 #endif
 
 /* ntp_control.c */
-struct ctl_trap;
-extern struct ctl_trap ctl_trap[];
 extern int	num_ctl_traps;
 extern keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */