svn commit: r363914 - in stable/12/stand: common efi/include efi/libefi

[Kyle Evans]

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 <time.h>
  and delay() is declared in <bootstrap.h>. 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 <bootstrap.h>.

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 <netinet/in_systm.h>
 
 #include <stand.h>
+#include <bootstrap.h>
 #include <net.h>
 
 #include <efi.h>