Mon Dec 14 00:43:09 2009 UTC ()
don't warn about SLEW; ntpd defines it!


(christos)
diff -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs diff -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h (expand / switch to unified diff)

--- src/external/bsd/ntp/dist/ntpd/ntpd-opts.h 2009/12/13 16:56:16 1.1.1.1
+++ src/external/bsd/ntp/dist/ntpd/ntpd-opts.h 2009/12/14 00:43:09 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ntpd-opts.h,v 1.1.1.1 2009/12/13 16:56:16 kardel Exp $ */ 1/* $NetBSD: ntpd-opts.h,v 1.2 2009/12/14 00:43:09 christos Exp $ */
2 2
3/*  3/*
4 * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) 4 * EDIT THIS FILE WITH CAUTION (ntpd-opts.h)
5 *  5 *
6 * It has been AutoGen-ed December 10, 2009 at 04:56:47 AM by AutoGen 5.10 6 * It has been AutoGen-ed December 10, 2009 at 04:56:47 AM by AutoGen 5.10
7 * From the definitions ntpd-opts.def 7 * From the definitions ntpd-opts.def
8 * and the template file options 8 * and the template file options
9 * 9 *
10 * Generated from AutoOpts 33:0:8 templates. 10 * Generated from AutoOpts 33:0:8 templates.
11 */ 11 */
12 12
13/* 13/*
14 * This file was produced by an AutoOpts template. AutoOpts is a 14 * This file was produced by an AutoOpts template. AutoOpts is a
@@ -226,30 +226,34 @@ typedef enum { @@ -226,30 +226,34 @@ typedef enum {
226# endif 226# endif
227# ifdef UPDATEINTERVAL 227# ifdef UPDATEINTERVAL
228# warning undefining UPDATEINTERVAL due to option name conflict 228# warning undefining UPDATEINTERVAL due to option name conflict
229# undef UPDATEINTERVAL 229# undef UPDATEINTERVAL
230# endif 230# endif
231# ifdef VAR 231# ifdef VAR
232# warning undefining VAR due to option name conflict 232# warning undefining VAR due to option name conflict
233# undef VAR 233# undef VAR
234# endif 234# endif
235# ifdef DVAR 235# ifdef DVAR
236# warning undefining DVAR due to option name conflict 236# warning undefining DVAR due to option name conflict
237# undef DVAR 237# undef DVAR
238# endif 238# endif
 239
 240/* Defined in ntpsim.h!
239# ifdef SLEW 241# ifdef SLEW
240# warning undefining SLEW due to option name conflict 242# warning undefining SLEW due to option name conflict
241# undef SLEW 243# undef SLEW
242# endif 244# endif
 245*/
 246
243# ifdef USEPCC 247# ifdef USEPCC
244# warning undefining USEPCC due to option name conflict 248# warning undefining USEPCC due to option name conflict
245# undef USEPCC 249# undef USEPCC
246# endif 250# endif
247# ifdef PCCFREQ 251# ifdef PCCFREQ
248# warning undefining PCCFREQ due to option name conflict 252# warning undefining PCCFREQ due to option name conflict
249# undef PCCFREQ 253# undef PCCFREQ
250# endif 254# endif
251#else /* NO_OPTION_NAME_WARNINGS */ 255#else /* NO_OPTION_NAME_WARNINGS */
252# undef IPV4 256# undef IPV4
253# undef IPV6 257# undef IPV6
254# undef AUTHREQ 258# undef AUTHREQ
255# undef AUTHNOREQ 259# undef AUTHNOREQ