aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOllivier Robert <roberto@FreeBSD.org>2006-09-28 16:02:34 +0000
committerOllivier Robert <roberto@FreeBSD.org>2006-09-28 16:02:34 +0000
commit8c24a1e0ffd629427f94da1b681600008030c41a (patch)
tree07075aad65cccb21c6871e64ce2306b35c8d0d67
parentb9bb0f5d00084ab6452843002797f92db4806239 (diff)
downloadsrc-8c24a1e0ffd629427f94da1b681600008030c41a.tar.gz
src-8c24a1e0ffd629427f94da1b681600008030c41a.zip
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
Notes
Notes: svn path=/vendor/ntp/dist/; revision=162735
-rw-r--r--contrib/ntp/include/ntp_stdlib.h2
-rw-r--r--contrib/ntp/include/ntpd.h2
2 files changed, 4 insertions, 0 deletions
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 */