diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-01-15 08:19:12 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-01-15 08:19:12 +0000 |
| commit | 7300a3c9866c58c75db9cf3f12d5d4492c040844 (patch) | |
| tree | 18a1f1aecaabb94f0e5a77d7168dc7794cf554c0 /usr.sbin/ntpd/ntpd.h | |
| parent | 7b97bb0346a400ffdf16127b2024dcb4e3c1476a (diff) | |
Although Unix compilers accept more than one definition of a global
symbol, follow the guidelines from K&R: only one definition of a
global symbol (and possibly more declarations). Rename some vars
here and there to avoid shadowing. ok henning@
Diffstat (limited to 'usr.sbin/ntpd/ntpd.h')
| -rw-r--r-- | usr.sbin/ntpd/ntpd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h index e5539e0589b..ccfeb63b07e 100644 --- a/usr.sbin/ntpd/ntpd.h +++ b/usr.sbin/ntpd/ntpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.h,v 1.80 2006/12/23 17:49:53 deraadt Exp $ */ +/* $OpenBSD: ntpd.h,v 1.81 2007/01/15 08:19:11 otto Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -263,6 +263,7 @@ int priv_adjtime(void); void priv_settime(double); void priv_host_dns(char *, u_int32_t); int offset_compare(const void *, const void *); +extern struct ntpd_conf *conf; /* parse.y */ int parse_config(const char *, struct ntpd_conf *); @@ -306,7 +307,7 @@ double sfp_to_d(struct s_fixedpt); struct s_fixedpt d_to_sfp(double); /* sensors.c */ -void sensor_init(struct ntpd_conf *); +void sensor_init(void); void sensor_scan(void); void sensor_query(struct ntp_sensor *); int sensor_hotplugfd(void); |