[src/trunk]: src/external/bsd/ntp/dist Don't define psl as common symbol, mov...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53b0065db3b9
branches:  trunk
changeset: 1010629:53b0065db3b9
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat May 30 23:52:09 2020 +0000

description:
Don't define psl as common symbol, move it into the only file using it.

diffstat:

 external/bsd/ntp/dist/include/ntp_config.h |  13 +------------
 external/bsd/ntp/dist/ntpd/ntp_config.c    |  12 +++++++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diffs (53 lines):

diff -r f94c7d57c2f8 -r 53b0065db3b9 external/bsd/ntp/dist/include/ntp_config.h
--- a/external/bsd/ntp/dist/include/ntp_config.h        Sat May 30 22:39:40 2020 +0000
+++ b/external/bsd/ntp/dist/include/ntp_config.h        Sat May 30 23:52:09 2020 +0000
@@ -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 @@
        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
 */
diff -r f94c7d57c2f8 -r 53b0065db3b9 external/bsd/ntp/dist/ntpd/ntp_config.c
--- a/external/bsd/ntp/dist/ntpd/ntp_config.c   Sat May 30 22:39:40 2020 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_config.c   Sat May 30 23:52:09 2020 +0000
@@ -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 @@
 # 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;