NetBSD/dist/ntp/ntpd
riz 254aabe783 There was a change from usecs to nsecs between ntpd 4.1.1 and 4.2.0 -
take this into account correctly.  From ntp-current via Brian Buhrow
in PR#29685.  Approved by christos.
2005-05-21 01:47:09 +00:00
..
check_y2k.c resolve conflicts 2003-12-04 16:23:34 +00:00
cmd_args.c resolve conflicts 2003-12-04 16:23:34 +00:00
jupiter.h resolve conflicts 2003-12-04 16:23:34 +00:00
Makefile.am
Makefile.in
map_vme.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_config.c don't join a multicast group where we just want to send 2003-12-04 17:01:32 +00:00
ntp_control.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_crypto.c use return value of openssl's RAND_file_name(), this makes the 2003-12-04 17:06:12 +00:00
ntp_filegen.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_intres.c include <isc/net.h> so that -UWANT_IPV6 compiles correctly. 2005-01-10 02:14:46 +00:00
ntp_io.c PR/27137: Martin J. Laubach: core dump when localhost does not support 2004-10-05 03:34:38 +00:00
ntp_loopfilter.c pull in a set of patches from ntp bk to fix the 2003-12-04 17:22:31 +00:00
ntp_monitor.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_peer.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_proto.c PR/27137: Martin J. Laubach: core dump when localhost does not support 2004-10-05 03:34:38 +00:00
ntp_refclock.c PR/27210: Paul Shupak: "ntpd"'s NEMA driver has 8 units, but MAX_UNITS 2004-10-10 22:13:04 +00:00
ntp_request.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_restrict.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_timer.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntp_util.c resolve conflicts 2003-12-04 16:23:34 +00:00
ntpd.c Double the stack space limit. We are running out with ntp.pool.org. 2005-04-05 20:56:58 +00:00
ntpsim.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_acts.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_arbiter.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_arc.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_as2201.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_atom.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_bancomm.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_chronolog.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_chu.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_conf.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_datum.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_dumbclock.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_fg.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_gpsvme.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_heath.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_hopfpci.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_hopfser.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_hpgps.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_irig.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_jjy.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_jupiter.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_leitch.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_local.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_msfees.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_mx4200.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_neoclock4x.c Stop argument to ctype function being char 2004-10-30 15:01:32 +00:00
refclock_nmea.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_oncore.c Stop argument to ctype function being char 2004-10-30 15:01:32 +00:00
refclock_palisade.c There was a change from usecs to nsecs between ntpd 4.1.1 and 4.2.0 - 2005-05-21 01:47:09 +00:00
refclock_palisade.h resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_parse.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_pcf.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_pst.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_ptbacts.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_ripencc.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_shm.c fix some LP64 issues (ntp bug #233) 2003-12-04 17:10:34 +00:00
refclock_tpro.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_trak.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_true.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_tt560.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_ulink.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_usno.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_wwv.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_wwvb.c resolve conflicts 2003-12-04 16:23:34 +00:00
refclock_zyfer.c resolve conflicts 2003-12-04 16:23:34 +00:00