diff options
Diffstat (limited to 'payloads/libpayload')
| -rw-r--r-- | payloads/libpayload/arch/x86/boot_media.c | 6 | ||||
| -rw-r--r-- | payloads/libpayload/include/stddef.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/payloads/libpayload/arch/x86/boot_media.c b/payloads/libpayload/arch/x86/boot_media.c index 99fb4e3c2a..07e08b6134 100644 --- a/payloads/libpayload/arch/x86/boot_media.c +++ b/payloads/libpayload/arch/x86/boot_media.c @@ -1,11 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -#include <arch/virtual.h> +#include <libpayload.h> #include <boot_device.h> -#include <commonlib/bsd/cb_err.h> -#include <stddef.h> -#include <string.h> -#include <sysinfo.h> __attribute__((weak)) ssize_t boot_device_read(void *buf, size_t offset, size_t size) { diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h index fb6ec9bf20..9003ac9550 100644 --- a/payloads/libpayload/include/stddef.h +++ b/payloads/libpayload/include/stddef.h @@ -2,7 +2,10 @@ #define _STDDEF_H #include <arch/types.h> -#include <commonlib/bsd/helpers.h> + +#if !defined(offsetof) +#define offsetof(type, member) __builtin_offsetof(type, member) +#endif #ifndef __WCHAR_TYPE__ #define __WCHAR_TYPE__ int |