From owner-svn-src-stable-12@freebsd.org Wed Aug 5 14:42:46 2020 Return-Path: Delivered-To: svn-src-stable-12@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 C85683786D6; Wed, 5 Aug 2020 14:42:46 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BMDqp4xmmz4vRh; Wed, 5 Aug 2020 14:42:46 +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 8C78817BC7; Wed, 5 Aug 2020 14:42:46 +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 075EgkAw008011; Wed, 5 Aug 2020 14:42:46 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 075EgkPS008009; Wed, 5 Aug 2020 14:42:46 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008051442.075EgkPS008009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 5 Aug 2020 14:42:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363914 - in stable/12/stand: common efi/include efi/libefi X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/12/stand: common efi/include efi/libefi X-SVN-Commit-Revision: 363914 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 14:42:46 -0000 Author: kevans Date: Wed Aug 5 14:42:45 2020 New Revision: 363914 URL: https://svnweb.freebsd.org/changeset/base/363914 Log: MFC r362564: stand: remove redundant declarations These are picked out by the amd64-gcc6 build; time() is declared in and delay() is declared in . These are the correct places for these in stand/, so remove the duplicate declarations and make sure the delay() consumer in libefi that depended on the extra delay() declaration includes . Modified: stable/12/stand/common/bootstrap.h stable/12/stand/efi/include/efilib.h stable/12/stand/efi/libefi/efihttp.c Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/common/bootstrap.h ============================================================================== --- stable/12/stand/common/bootstrap.h Wed Aug 5 14:40:09 2020 (r363913) +++ stable/12/stand/common/bootstrap.h Wed Aug 5 14:42:45 2020 (r363914) @@ -345,8 +345,6 @@ void delay(int delay); void dev_cleanup(void); -time_t time(time_t *tloc); - #ifndef CTASSERT #define CTASSERT(x) _Static_assert(x, "compile-time assertion failed") #endif Modified: stable/12/stand/efi/include/efilib.h ============================================================================== --- stable/12/stand/efi/include/efilib.h Wed Aug 5 14:40:09 2020 (r363913) +++ stable/12/stand/efi/include/efilib.h Wed Aug 5 14:42:45 2020 (r363914) @@ -111,7 +111,6 @@ EFI_STATUS efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABL EFI_STATUS main(int argc, CHAR16 *argv[]); void efi_exit(EFI_STATUS status) __dead2; -void delay(int usecs); /* EFI environment initialization. */ void efi_init_environment(void); Modified: stable/12/stand/efi/libefi/efihttp.c ============================================================================== --- stable/12/stand/efi/libefi/efihttp.c Wed Aug 5 14:40:09 2020 (r363913) +++ stable/12/stand/efi/libefi/efihttp.c Wed Aug 5 14:42:45 2020 (r363914) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include