|
 |
4c0d37 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4c0d37 |
From: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
Date: Tue, 27 Aug 2019 13:44:15 -0400
|
|
|
4c0d37 |
Subject: [PATCH] Make CHAR8 and similar be defined the same way edk2 does it.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
---
|
|
|
4c0d37 |
inc/aa64/efibind.h | 7 +++++++
|
|
|
4c0d37 |
inc/arm/efibind.h | 7 +++++++
|
|
|
4c0d37 |
inc/efidef.h | 7 +++----
|
|
|
4c0d37 |
inc/ia32/efibind.h | 7 +++++++
|
|
|
4c0d37 |
inc/ia64/efibind.h | 11 +++++++++--
|
|
|
4c0d37 |
inc/mips64el/efibind.h | 7 +++++++
|
|
|
4c0d37 |
inc/x64/efibind.h | 4 ++++
|
|
|
4c0d37 |
7 files changed, 44 insertions(+), 6 deletions(-)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/inc/aa64/efibind.h b/inc/aa64/efibind.h
|
|
|
4c0d37 |
index c4eafa0d8a8..00c7cead486 100644
|
|
|
4c0d37 |
--- a/inc/aa64/efibind.h
|
|
|
4c0d37 |
+++ b/inc/aa64/efibind.h
|
|
|
4c0d37 |
@@ -43,6 +43,9 @@ typedef int64_t intptr_t;
|
|
|
4c0d37 |
#ifndef __WCHAR_TYPE__
|
|
|
4c0d37 |
# define __WCHAR_TYPE__ short
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
+#ifndef __CHAR16_TYPE__
|
|
|
4c0d37 |
+# define __CHAR16_TYPE__ unsigned short
|
|
|
4c0d37 |
+#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint64_t UINT64;
|
|
|
4c0d37 |
typedef int64_t INT64;
|
|
|
4c0d37 |
@@ -51,9 +54,13 @@ typedef uint32_t UINT32;
|
|
|
4c0d37 |
typedef int32_t INT32;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
#undef VOID
|
|
|
4c0d37 |
diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h
|
|
|
4c0d37 |
index 012d3d2f8c9..42de542257c 100644
|
|
|
4c0d37 |
--- a/inc/arm/efibind.h
|
|
|
4c0d37 |
+++ b/inc/arm/efibind.h
|
|
|
4c0d37 |
@@ -49,6 +49,9 @@ typedef int32_t intptr_t;
|
|
|
4c0d37 |
#ifndef __WCHAR_TYPE__
|
|
|
4c0d37 |
# define __WCHAR_TYPE__ short
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
+#ifndef __CHAR16_TYPE__
|
|
|
4c0d37 |
+# define __CHAR16_TYPE__ unsigned short
|
|
|
4c0d37 |
+#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint64_t UINT64;
|
|
|
4c0d37 |
typedef int64_t INT64;
|
|
|
4c0d37 |
@@ -57,9 +60,13 @@ typedef uint32_t UINT32;
|
|
|
4c0d37 |
typedef int32_t INT32;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
#undef VOID
|
|
|
4c0d37 |
diff --git a/inc/efidef.h b/inc/efidef.h
|
|
|
4c0d37 |
index 8b70051f43a..a552c7d91c3 100644
|
|
|
4c0d37 |
--- a/inc/efidef.h
|
|
|
4c0d37 |
+++ b/inc/efidef.h
|
|
|
4c0d37 |
@@ -20,9 +20,8 @@ Revision History
|
|
|
4c0d37 |
|
|
|
4c0d37 |
--*/
|
|
|
4c0d37 |
|
|
|
4c0d37 |
-typedef UINT16 CHAR16;
|
|
|
4c0d37 |
-typedef UINT8 CHAR8;
|
|
|
4c0d37 |
-typedef UINT8 BOOLEAN;
|
|
|
4c0d37 |
+typedef unsigned char BOOLEAN;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
#ifndef CONST
|
|
|
4c0d37 |
#define CONST const
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
@@ -194,7 +193,7 @@ typedef struct {
|
|
|
4c0d37 |
// International Language
|
|
|
4c0d37 |
//
|
|
|
4c0d37 |
|
|
|
4c0d37 |
-typedef UINT8 ISO_639_2;
|
|
|
4c0d37 |
+typedef CHAR8 ISO_639_2;
|
|
|
4c0d37 |
#define ISO_639_2_ENTRY_SIZE 3
|
|
|
4c0d37 |
|
|
|
4c0d37 |
//
|
|
|
4c0d37 |
diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
|
|
|
4c0d37 |
index 27459e454d1..b0b0d76151f 100644
|
|
|
4c0d37 |
--- a/inc/ia32/efibind.h
|
|
|
4c0d37 |
+++ b/inc/ia32/efibind.h
|
|
|
4c0d37 |
@@ -88,6 +88,9 @@ Revision History
|
|
|
4c0d37 |
#ifndef __WCHAR_TYPE__
|
|
|
4c0d37 |
# define __WCHAR_TYPE__ short
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
+#ifndef __CHAR16_TYPE__
|
|
|
4c0d37 |
+# define __CHAR16_TYPE__ unsigned short
|
|
|
4c0d37 |
+#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint64_t UINT64;
|
|
|
4c0d37 |
typedef int64_t INT64;
|
|
|
4c0d37 |
@@ -98,9 +101,13 @@ typedef int64_t INT64;
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
#undef VOID
|
|
|
4c0d37 |
diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
|
|
|
4c0d37 |
index 3ace8d59190..ebe8cac3e94 100644
|
|
|
4c0d37 |
--- a/inc/ia64/efibind.h
|
|
|
4c0d37 |
+++ b/inc/ia64/efibind.h
|
|
|
4c0d37 |
@@ -74,19 +74,26 @@ Revision History
|
|
|
4c0d37 |
#ifndef __WCHAR_TYPE__
|
|
|
4c0d37 |
# define __WCHAR_TYPE__ short
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
-
|
|
|
4c0d37 |
+#ifndef __CHAR16_TYPE__
|
|
|
4c0d37 |
+# define __CHAR16_TYPE__ unsigned short
|
|
|
4c0d37 |
+#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint64_t UINT64;
|
|
|
4c0d37 |
typedef int64_t INT64;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint32_t UINT32;
|
|
|
4c0d37 |
typedef int32_t INT32;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
-
|
|
|
4c0d37 |
#undef VOID
|
|
|
4c0d37 |
#define VOID void
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h
|
|
|
4c0d37 |
index 1f08cd346d0..e26c51904ee 100644
|
|
|
4c0d37 |
--- a/inc/mips64el/efibind.h
|
|
|
4c0d37 |
+++ b/inc/mips64el/efibind.h
|
|
|
4c0d37 |
@@ -43,6 +43,9 @@ typedef int64_t intptr_t;
|
|
|
4c0d37 |
#ifndef __WCHAR_TYPE__
|
|
|
4c0d37 |
# define __WCHAR_TYPE__ short
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
+#ifndef __CHAR16_TYPE__
|
|
|
4c0d37 |
+# define __CHAR16_TYPE__ unsigned short
|
|
|
4c0d37 |
+#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint64_t UINT64;
|
|
|
4c0d37 |
typedef int64_t INT64;
|
|
|
4c0d37 |
@@ -51,9 +54,13 @@ typedef uint32_t UINT32;
|
|
|
4c0d37 |
typedef int32_t INT32;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
#undef VOID
|
|
|
4c0d37 |
diff --git a/inc/x64/efibind.h b/inc/x64/efibind.h
|
|
|
4c0d37 |
index 2750ab9be7d..e7feed9dbe4 100644
|
|
|
4c0d37 |
--- a/inc/x64/efibind.h
|
|
|
4c0d37 |
+++ b/inc/x64/efibind.h
|
|
|
4c0d37 |
@@ -107,9 +107,13 @@ typedef int64_t INT64;
|
|
|
4c0d37 |
#endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
typedef uint16_t UINT16;
|
|
|
4c0d37 |
+typedef __CHAR16_TYPE__ CHAR16;
|
|
|
4c0d37 |
typedef int16_t INT16;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef uint8_t UINT8;
|
|
|
4c0d37 |
+typedef char CHAR8;
|
|
|
4c0d37 |
typedef int8_t INT8;
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
typedef __WCHAR_TYPE__ WCHAR;
|
|
|
4c0d37 |
|
|
|
4c0d37 |
#undef VOID
|