resolve typedef conflicts between efi and acpica headers trunk
authortnn <tnn@NetBSD.org>
Fri, 13 Sep 2019 20:56:29 +0000
branchtrunk
changeset 454336 1cc2eb9cf4a8
parent 454335 b8b8ce53e293
child 454337 be45f01dc05a
resolve typedef conflicts between efi and acpica headers needed for exec_multiboot2.c which includes headers from both projects
sys/external/bsd/gnu-efi/dist/inc/efidef.h
sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
--- a/sys/external/bsd/gnu-efi/dist/inc/efidef.h	Fri Sep 13 20:50:45 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/inc/efidef.h	Fri Sep 13 20:56:29 2019 +0000
@@ -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 @@
 
 typedef UINT16          CHAR16;
 typedef UINT8           CHAR8;
+#ifndef __ACTYPES_H__
 typedef UINT8           BOOLEAN;
+#endif /* __ACTYPES_H__ */
 #ifndef CONST
    #define CONST const
 #endif
--- a/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h	Fri Sep 13 20:50:45 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h	Fri Sep 13 20:56:29 2019 +0000
@@ -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 @@
 # define __WCHAR_TYPE__ short
 #endif
 
+#ifndef __ACTYPES_H__
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
 
@@ -103,6 +104,7 @@
 typedef int16_t    INT16;
 typedef uint8_t    UINT8;
 typedef int8_t     INT8;
+#endif /* __ACTYPES_H__ */
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
--- a/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h	Fri Sep 13 20:50:45 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h	Fri Sep 13 20:56:29 2019 +0000
@@ -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 @@
 # define __WCHAR_TYPE__ short
 #endif
 
+#ifndef __ACTYPES_H__
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
 
@@ -112,6 +113,7 @@
 typedef int16_t    INT16;
 typedef uint8_t    UINT8;
 typedef int8_t     INT8;
+#endif /* __ACTYPES_H__ */
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID