diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-08-05 14:42:45 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-08-05 14:42:45 +0000 |
| commit | bbcb78079f9d8b467d0f42728a6e2b1568f42d10 (patch) | |
| tree | 11a7dce049af0631350a081cd46dcad73a2f89ee /stand | |
| parent | a9f7168433240c70682e2bdd9f24c0b76f9b3640 (diff) | |
| download | src-test2-bbcb78079f9d8b467d0f42728a6e2b1568f42d10.tar.gz src-test2-bbcb78079f9d8b467d0f42728a6e2b1568f42d10.zip | |
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>.
Notes
Notes:
svn path=/stable/12/; revision=363914
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/common/bootstrap.h | 2 | ||||
| -rw-r--r-- | stand/efi/include/efilib.h | 1 | ||||
| -rw-r--r-- | stand/efi/libefi/efihttp.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 2be6538efe4c..809859c276b9 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -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 diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h index a95fba64ff41..aace2351fcc6 100644 --- a/stand/efi/include/efilib.h +++ b/stand/efi/include/efilib.h @@ -111,7 +111,6 @@ EFI_STATUS efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE* Xsystab); 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); diff --git a/stand/efi/libefi/efihttp.c b/stand/efi/libefi/efihttp.c index e637da23a088..12d445c55b67 100644 --- a/stand/efi/libefi/efihttp.c +++ b/stand/efi/libefi/efihttp.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in_systm.h> #include <stand.h> +#include <bootstrap.h> #include <net.h> #include <efi.h> |