Module Name: src Committed By: christos Date: Mon Dec 14 00:43:09 UTC 2009
Modified Files: src/external/bsd/ntp/dist/ntpd: ntpd-opts.h Log Message: don't warn about SLEW; ntpd defines it! To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/ntp/dist/ntpd/ntpd-opts.h diff -u src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.1.1.1 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.2 --- src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.1.1.1 Sun Dec 13 11:56:16 2009 +++ src/external/bsd/ntp/dist/ntpd/ntpd-opts.h Sun Dec 13 19:43:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ntpd-opts.h,v 1.1.1.1 2009/12/13 16:56:16 kardel Exp $ */ +/* $NetBSD: ntpd-opts.h,v 1.2 2009/12/14 00:43:09 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) @@ -236,10 +236,14 @@ # warning undefining DVAR due to option name conflict # undef DVAR # endif + +/* Defined in ntpsim.h! # ifdef SLEW # warning undefining SLEW due to option name conflict # undef SLEW # endif +*/ + # ifdef USEPCC # warning undefining USEPCC due to option name conflict # undef USEPCC