[src/trunk]: src/sys/external/bsd/gnu-efi/dist/inc resolve typedef conflicts ...

[tnn <tnn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/155bb46f7f4f
branches:  trunk
changeset: 965358:155bb46f7f4f
user:      tnn <tnn%NetBSD.org@localhost>
date:      Fri Sep 13 20:56:29 2019 +0000

description:
resolve typedef conflicts between efi and acpica headers

needed for exec_multiboot2.c which includes headers from both projects

diffstat:

 sys/external/bsd/gnu-efi/dist/inc/efidef.h         |  4 +++-
 sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h   |  4 +++-
 sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h |  4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r d7244c83847b -r 155bb46f7f4f sys/external/bsd/gnu-efi/dist/inc/efidef.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
diff -r d7244c83847b -r 155bb46f7f4f sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
--- 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
diff -r d7244c83847b -r 155bb46f7f4f sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
--- 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