Module Name: src
Committed By: tnn
Date: Fri Sep 13 20:56:29 UTC 2019
Modified Files:
src/sys/external/bsd/gnu-efi/dist/inc: efidef.h
src/sys/external/bsd/gnu-efi/dist/inc/ia32: efibind.h
src/sys/external/bsd/gnu-efi/dist/inc/x86_64: efibind.h
Log Message:
resolve typedef conflicts between efi and acpica headers
needed for exec_multiboot2.c which includes headers from both projects
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/inc/efidef.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/gnu-efi/dist/inc/efidef.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/efidef.h:1.3 src/sys/external/bsd/gnu-efi/dist/inc/efidef.h:1.4
--- src/sys/external/bsd/gnu-efi/dist/inc/efidef.h:1.3 Thu Aug 16 18:22:05 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/efidef.h Fri Sep 13 20:56:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efidef.h,v 1.3 2018/08/16 18:22:05 jmcneill Exp $ */
+/* $NetBSD: efidef.h,v 1.4 2019/09/13 20:56:29 tnn Exp $ */
#ifndef _EFI_DEF_H
#define _EFI_DEF_H
@@ -24,7 +24,9 @@ Revision History
typedef UINT16 CHAR16;
typedef UINT8 CHAR8;
+#ifndef __ACTYPES_H__
typedef UINT8 BOOLEAN;
+#endif /* __ACTYPES_H__ */
#ifndef CONST
#define CONST const
#endif
Index: src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h:1.3 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h:1.4
--- src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h:1.3 Thu Aug 16 18:22:05 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h Fri Sep 13 20:56:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efibind.h,v 1.3 2018/08/16 18:22:05 jmcneill Exp $ */
+/* $NetBSD: efibind.h,v 1.4 2019/09/13 20:56:29 tnn Exp $ */
/*++
@@ -91,6 +91,7 @@ Revision History
# define __WCHAR_TYPE__ short
#endif
+#ifndef __ACTYPES_H__
typedef uint64_t UINT64;
typedef int64_t INT64;
@@ -103,6 +104,7 @@ typedef uint16_t UINT16;
typedef int16_t INT16;
typedef uint8_t UINT8;
typedef int8_t INT8;
+#endif /* __ACTYPES_H__ */
typedef __WCHAR_TYPE__ WCHAR;
#undef VOID
Index: src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h:1.3 src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h:1.4
--- src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h:1.3 Thu Aug 16 18:22:05 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h Fri Sep 13 20:56:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efibind.h,v 1.3 2018/08/16 18:22:05 jmcneill Exp $ */
+/* $NetBSD: efibind.h,v 1.4 2019/09/13 20:56:29 tnn Exp $ */
/*++
@@ -100,6 +100,7 @@ Revision History
# define __WCHAR_TYPE__ short
#endif
+#ifndef __ACTYPES_H__
typedef uint64_t UINT64;
typedef int64_t INT64;
@@ -112,6 +113,7 @@ typedef uint16_t UINT16;
typedef int16_t INT16;
typedef uint8_t UINT8;
typedef int8_t INT8;
+#endif /* __ACTYPES_H__ */
typedef __WCHAR_TYPE__ WCHAR;
#undef VOID
