diff options
Diffstat (limited to 'contrib/ntp/include')
| -rw-r--r-- | contrib/ntp/include/l_stdlib.h | 2 | ||||
| -rw-r--r-- | contrib/ntp/include/ntp.h | 7 | ||||
| -rw-r--r-- | contrib/ntp/include/ntp_syscall.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/contrib/ntp/include/l_stdlib.h b/contrib/ntp/include/l_stdlib.h index ca47af8..89eb545 100644 --- a/contrib/ntp/include/l_stdlib.h +++ b/contrib/ntp/include/l_stdlib.h @@ -235,7 +235,7 @@ extern int toupper P((int)); extern int errno; #endif -#ifdef DECL_H_ERRNO +#if defined(DECL_H_ERRNO) && !defined(h_errno) extern int h_errno; #endif diff --git a/contrib/ntp/include/ntp.h b/contrib/ntp/include/ntp.h index 5881df1..5708b7c 100644 --- a/contrib/ntp/include/ntp.h +++ b/contrib/ntp/include/ntp.h @@ -458,8 +458,11 @@ struct peer { #define REFCLK_HOPF_SERIAL 38 /* hopf DCF77/GPS serial line receiver */ #define REFCLK_HOPF_PCI 39 /* hopf DCF77/GPS PCI receiver */ #define REFCLK_JJY 40 /* JJY receiver */ -#define REFCLK_ZYFER 41 /* Zyfer GPStarplus receiver */ -#define REFCLK_MAX 41 /* Grow as needed... */ +#define REFCLK_TT560 41 /* TrueTime 560 IRIG-B decoder */ +#define REFCLK_ZYFER 42 /* Zyfer GPStarplus receiver */ +#define REFCLK_RIPENCC 43 /* RIPE NCC Trimble driver */ +#define REFCLK_NEOCLOCK4X 44 /* NeoClock4X DCF77 or TDF receiver */ +#define REFCLK_MAX 44 /* Grow as needed... */ /* * We tell reference clocks from real peers by giving the reference diff --git a/contrib/ntp/include/ntp_syscall.h b/contrib/ntp/include/ntp_syscall.h index 29dff91..521e753 100644 --- a/contrib/ntp/include/ntp_syscall.h +++ b/contrib/ntp/include/ntp_syscall.h @@ -14,6 +14,7 @@ # include <sys/timex.h> #endif +#ifndef NTP_SYSCALLS_LIBC #ifdef NTP_SYSCALLS_STD # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) # define ntp_gettime(t) syscall(SYS_ntp_gettime, (t)) @@ -49,5 +50,6 @@ ntp_gettime( # endif # endif /* !HAVE_ADJTIMEX */ #endif /* !NTP_SYSCALLS_STD */ +#endif /* !NTP_SYSCALLS_LIBC */ #endif /* NTP_SYSCALL_H */ |
