diff options
| author | Warner Losh <imp@FreeBSD.org> | 2015-02-20 01:40:55 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2015-02-20 01:40:55 +0000 |
| commit | cda676ac0d133763e36168f23452f5497e52f1e2 (patch) | |
| tree | 51593f4e6b3403843618a1e71c33414612ee6969 /sys/boot/efi/include/amd64/efibind.h | |
| parent | a9a4a706eb9d5d4e0081f003370217056676220d (diff) | |
| download | src-cda676ac0d133763e36168f23452f5497e52f1e2.tar.gz src-cda676ac0d133763e36168f23452f5497e52f1e2.zip | |
Allow EFI and ACPI to be included together. When ACPI is included
first, EFI will use its definitions for {,U}INT{8,16,32,64} and
BOOLEAN. When EFI is included first, define ACPI_USE_SYSTEM_INTTYPES
to tell ACPI that these are already defined.
Differential Revision: https://reviews.freebsd.org/D1905
Notes
Notes:
svn path=/head/; revision=279038
Diffstat (limited to 'sys/boot/efi/include/amd64/efibind.h')
| -rw-r--r-- | sys/boot/efi/include/amd64/efibind.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/boot/efi/include/amd64/efibind.h b/sys/boot/efi/include/amd64/efibind.h index 1905596b7581..3d70b58a6271 100644 --- a/sys/boot/efi/include/amd64/efibind.h +++ b/sys/boot/efi/include/amd64/efibind.h @@ -85,6 +85,9 @@ Revision History // Basic EFI types of various widths // +#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine */ +#define ACPI_USE_SYSTEM_INTTYPES 1 /* Tell ACPI we've defined types */ + typedef uint64_t UINT64; typedef int64_t INT64; @@ -98,6 +101,7 @@ typedef int16_t INT16; typedef uint8_t UINT8; typedef int8_t INT8; +#endif #undef VOID #define VOID void |