From ff717da2cf625e3d07537a93a4c240692fa55bd6 Mon Sep 17 00:00:00 2001 From: Ollivier Robert Date: Mon, 18 Aug 2008 14:26:05 +0000 Subject: Import ntp 4.2.4p5 in the vendor code area. Far too many changes to list here, please see CommitLog for detailed changes. XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts with the detect-merge-conflict.sh script in our repo. --- include/ntp_fp.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/ntp_fp.h') diff --git a/include/ntp_fp.h b/include/ntp_fp.h index 256bab830a04..307ab102dd4b 100644 --- a/include/ntp_fp.h +++ b/include/ntp_fp.h @@ -7,9 +7,10 @@ #include #include -#include "ntp_rfc2553.h" #include +#include "ntp_rfc2553.h" + #include "ntp_types.h" /* @@ -281,7 +282,7 @@ typedef u_int32 u_fp; #define L_SUBUF(r, uf) M_SUBUF((r)->l_ui, (r)->l_uf, (uf)) #define L_ADDF(r, f) M_ADDF((r)->l_ui, (r)->l_uf, (f)) #define L_RSHIFT(v) M_RSHIFT((v)->l_i, (v)->l_uf) -#define L_RSHIFTU(v) M_RSHIFT((v)->l_ui, (v)->l_uf) +#define L_RSHIFTU(v) M_RSHIFTU((v)->l_ui, (v)->l_uf) #define L_LSHIFT(v) M_LSHIFT((v)->l_ui, (v)->l_uf) #define L_CLR(v) ((v)->l_ui = (v)->l_uf = 0) @@ -358,6 +359,8 @@ extern void get_systime P((l_fp *)); extern int step_systime P((double)); extern int adj_systime P((double)); +extern struct tm * ntp2unix_tm P((u_long ntp, int local)); + #define lfptoa(_fpv, _ndec) mfptoa((_fpv)->l_ui, (_fpv)->l_uf, (_ndec)) #define lfptoms(_fpv, _ndec) mfptoms((_fpv)->l_ui, (_fpv)->l_uf, (_ndec)) -- cgit v1.2.3