Module Name: src Committed By: joerg Date: Sat May 30 23:52:10 UTC 2020
Modified Files: src/external/bsd/ntp/dist/include: ntp_config.h src/external/bsd/ntp/dist/ntpd: ntp_config.c Log Message: Don't define psl as common symbol, move it into the only file using it. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/include/ntp_config.h cvs rdiff -u -r1.23 -r1.24 src/external/bsd/ntp/dist/ntpd/ntp_config.c 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/include/ntp_config.h diff -u src/external/bsd/ntp/dist/include/ntp_config.h:1.12 src/external/bsd/ntp/dist/include/ntp_config.h:1.13 --- src/external/bsd/ntp/dist/include/ntp_config.h:1.12 Mon May 25 20:47:19 2020 +++ src/external/bsd/ntp/dist/include/ntp_config.h Sat May 30 23:52:09 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_config.h,v 1.12 2020/05/25 20:47:19 christos Exp $ */ +/* $NetBSD: ntp_config.h,v 1.13 2020/05/30 23:52:09 joerg Exp $ */ #ifndef NTP_CONFIG_H #define NTP_CONFIG_H @@ -277,17 +277,6 @@ typedef struct settrap_parms_tag { int ifaddr_nonnull; } settrap_parms; - -/* - * Poll Skew List - */ - -psl_item psl[17-3+1]; /* values for polls 3-17 */ - /* To simplify the runtime code we */ - /* don't want to have to special-case */ - /* dealing with a default */ - - /* ** Data Minimization Items */ Index: src/external/bsd/ntp/dist/ntpd/ntp_config.c diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.23 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.24 --- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.23 Wed May 27 23:52:19 2020 +++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Sat May 30 23:52:09 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_config.c,v 1.23 2020/05/27 23:52:19 christos Exp $ */ +/* $NetBSD: ntp_config.c,v 1.24 2020/05/30 23:52:09 joerg Exp $ */ /* ntp_config.c * @@ -69,6 +69,16 @@ extern int yyparse(void); # include <sys/mman.h> #endif +/* + * Poll Skew List + */ + +static psl_item psl[17-3+1]; /* values for polls 3-17 */ + /* To simplify the runtime code we */ + /* don't want to have to special-case */ + /* dealing with a default */ + + /* list of servers from command line for config_peers() */ int cmdline_server_count; char ** cmdline_servers;