From owner-dev-commits-src-all@freebsd.org Mon May 31 22:04:50 2021 Return-Path: Delivered-To: dev-commits-src-all@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 D6ECF6314F5; Mon, 31 May 2021 22:04:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fv8Tt5nVfz3JqR; Mon, 31 May 2021 22:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEBB518231; Mon, 31 May 2021 22:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14VM4oss060407; Mon, 31 May 2021 22:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14VM4oVg060406; Mon, 31 May 2021 22:04:50 GMT (envelope-from git) Date: Mon, 31 May 2021 22:04:50 GMT Message-Id: <202105312204.14VM4oVg060406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d912068ad826 - main - Remove duplicated lines in contrib/tzcode/stdtime/private.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d912068ad826e457f0c0203d1cad02df81c35bbc Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 22:04:50 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d912068ad826e457f0c0203d1cad02df81c35bbc commit d912068ad826e457f0c0203d1cad02df81c35bbc Author: Tim McNamara AuthorDate: 2018-06-07 09:51:38 +0000 Commit: Warner Losh CommitDate: 2021-05-31 22:03:37 +0000 Remove duplicated lines in contrib/tzcode/stdtime/private.h Note by imp: this is clearly a mis-merge from the vendor branch which doesn't have this stutter in it. Reviewed by: imp@,ngie@ Pull Request: https://github.com/freebsd/freebsd-src/pull/154 --- contrib/tzcode/stdtime/private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/contrib/tzcode/stdtime/private.h b/contrib/tzcode/stdtime/private.h index ab1397f31da2..8f8f725f8193 100644 --- a/contrib/tzcode/stdtime/private.h +++ b/contrib/tzcode/stdtime/private.h @@ -230,15 +230,6 @@ const char * scheck(const char * string, const char * format); #define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5) #endif /* !defined TYPE_INTEGRAL */ -/* -** Since the definition of TYPE_INTEGRAL contains floating point numbers, -** it cannot be used in preprocessor directives. -*/ - -#ifndef TYPE_INTEGRAL -#define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5) -#endif /* !defined TYPE_INTEGRAL */ - #ifndef INT_STRLEN_MAXIMUM /* ** 302 / 1000 is log10(2.0) rounded up.