diff options
| author | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
| commit | 7fcd33c1faf567506b5c0b4148c7a15a10788a5d (patch) | |
| tree | 2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /usr.sbin/ntp | |
| parent | 2a59274eda20cc626e28052fff7aa8b7bf6a3683 (diff) | |
| parent | 5cca672bb0892f1c5da630c34a1f98e2de4d7064 (diff) | |
| download | FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.zip FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.tar.gz | |
Merge head@256284
Diffstat (limited to 'usr.sbin/ntp')
| -rw-r--r-- | usr.sbin/ntp/config.h | 2 | ||||
| -rw-r--r-- | usr.sbin/ntp/libparse/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index efa42d2..41622f1 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -84,7 +84,7 @@ #define CLOCK_LOCAL 1 /* Meinberg clocks */ -/* #undef CLOCK_MEINBERG */ +#define CLOCK_MEINBERG 1 /* Magnavox MX4200 GPS receiver */ /* #undef CLOCK_MX4200 */ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index f86988e..9ccc4b3 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -9,7 +9,7 @@ SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ info_trimble.c parse.c parse_conf.c trim_info.c \ - binio.c gpstolfp.c + binio.c gpstolfp.c ieee754io.c mfp_mul.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ |
