From owner-svn-src-head@freebsd.org Mon Apr 6 23:11:44 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 599B327F88B; Mon, 6 Apr 2020 23:11:44 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48x5rv6wmBz3GZs; Mon, 6 Apr 2020 23:11:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E90442FC2E; Mon, 6 Apr 2020 23:11:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 036NBhq7007067; Mon, 6 Apr 2020 23:11:43 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 036NBhiI007065; Mon, 6 Apr 2020 23:11:43 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202004062311.036NBhiI007065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 6 Apr 2020 23:11:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359676 - in head/contrib/ntp: include ntpd X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/contrib/ntp: include ntpd X-SVN-Commit-Revision: 359676 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2020 23:11:44 -0000 Author: kevans Date: Mon Apr 6 23:11:43 2020 New Revision: 359676 URL: https://svnweb.freebsd.org/changeset/base/359676 Log: ntpd: fix build with -fno-common Only a small nit here: psl should be declared extern and defined exactly once. -fno-common will become the default in GCC10/LLVM11. MFC after: 3 days Modified: head/contrib/ntp/include/ntp_config.h head/contrib/ntp/ntpd/ntp_config.c Modified: head/contrib/ntp/include/ntp_config.h ============================================================================== --- head/contrib/ntp/include/ntp_config.h Mon Apr 6 23:08:07 2020 (r359675) +++ head/contrib/ntp/include/ntp_config.h Mon Apr 6 23:11:43 2020 (r359676) @@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { * Poll Skew List */ -psl_item psl[17-3+1]; /* values for polls 3-17 */ +extern 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 */ Modified: head/contrib/ntp/ntpd/ntp_config.c ============================================================================== --- head/contrib/ntp/ntpd/ntp_config.c Mon Apr 6 23:08:07 2020 (r359675) +++ head/contrib/ntp/ntpd/ntp_config.c Mon Apr 6 23:11:43 2020 (r359676) @@ -202,6 +202,8 @@ int cryptosw; /* crypto command called */ extern char *stats_drift_file; /* name of the driftfile */ +psl_item psl[17-3+1]; + #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED /* * backwards compatibility flags