[Bug 466] Fix compilation under gcc4

bk: 42dda6e41DRfu8CtPFm86HEC_V0vjg

diff --git a/include/ntp_control.h b/include/ntp_control.h
index 86f38100e17fdbf2218cd98d05c83db3980e3230..46c9a7003a780d26ac7f35ff9150bd918f2fcce2 100644 (file)
--- 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 5e33a8ce25a137b7aadcb29171299adf03bac7f8..112c4e372c5bd0c421b3620bcf2b93a28a164ab6 100644 (file)
--- 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 9d1d4c9bdcc02849f5c7beb05953f4f9a7dfba2c..9d3a741dc64e3cad8887992a3b391cb593c50839 100644 (file)
--- 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 a789d0f9c28d31cd1b4a02836125457d7f6ca5bb..90a274921a3bafa2d78b04f8c499e9e497a667ae 100644 (file)
--- 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 */