summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroberto <roberto@FreeBSD.org>2006-09-28 16:02:34 +0000
committerroberto <roberto@FreeBSD.org>2006-09-28 16:02:34 +0000
commit2ab556f91bd98940f77b002cd097890ea6dda4d0 (patch)
tree9e7558a8c367e39cfb33302287dc08411032bb2d
parenta69979a725daecad375dce2901734add23495736 (diff)
parent8b5a86d4fda08a9c68231415812edcb26be52f79 (diff)
downloadFreeBSD-src-2ab556f91bd98940f77b002cd097890ea6dda4d0.zip
FreeBSD-src-2ab556f91bd98940f77b002cd097890ea6dda4d0.tar.gz
This commit was generated by cvs2svn to compensate for changes in r162735,
which included commits to RCS files with non-trunk default branches.
-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 9d1d4c9..3dc6fe0 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 cd3aad2..54d3e13 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 */
OpenPOWER on IntegriCloud