Merge /u/gmbr3/gnu-efi/ branch CHAR16 into master

https://sourceforge.net/p/gnu-efi/code/merge-requests/48/

7 files changed, 36 insertions, 63 deletions

diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h
index da94c3b..d6b5d0f 100644
--- a/inc/aarch64/efibind.h
+++ b/inc/aarch64/efibind.h
@@ -38,12 +38,10 @@ typedef int64_t             intptr_t;
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -52,17 +50,14 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int64_t    INTN;
 typedef uint64_t   UINTN;
diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h
index b4753a1..8c578df 100644
--- a/inc/arm/efibind.h
+++ b/inc/arm/efibind.h
@@ -46,12 +46,10 @@ typedef int32_t             intptr_t;
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -60,17 +58,14 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int32_t    INTN;
 typedef uint32_t   UINTN;
diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
index b0b0d76..718e8d1 100644
--- a/inc/ia32/efibind.h
+++ b/inc/ia32/efibind.h
@@ -85,12 +85,11 @@ Revision History
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
+
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -101,17 +100,14 @@ typedef int64_t    INT64;
 #endif
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int32_t    INTN;
diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
index ebe8cac..1d2745b 100644
--- a/inc/ia64/efibind.h
+++ b/inc/ia64/efibind.h
@@ -71,12 +71,11 @@ Revision History
 //
 // Basic EFI types of various widths
 //
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__	short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -85,17 +84,14 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int64_t    INTN;
diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h
index e26c519..cf77ddc 100644
--- a/inc/mips64el/efibind.h
+++ b/inc/mips64el/efibind.h
@@ -40,12 +40,10 @@ typedef int64_t             intptr_t;
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -54,17 +52,14 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int64_t    INTN;
 typedef uint64_t   UINTN;
diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
index dfec652..4fdf81d 100644
--- a/inc/riscv64/efibind.h
+++ b/inc/riscv64/efibind.h
@@ -22,7 +22,7 @@
 // Basic EFI types of various widths
 //
 
-
+#include <stddef.h>
 
 typedef uint64_t                UINT64;
 typedef int64_t                 INT64;
@@ -32,15 +32,13 @@ typedef uint16_t                UINT16;
 typedef int16_t                 INT16;
 typedef uint8_t                 UINT8;
 typedef int8_t                  INT8;
-#ifndef __WCHAR_TYPE__
-#define __WCHAR_TYPE__          short
-#endif
-typedef __WCHAR_TYPE__          WCHAR;
+typedef wchar_t                 CHAR16;
+#define WCHAR                   CHAR16
 #ifndef BOOLEAN
 typedef uint8_t                 BOOLEAN;
 #endif
 #undef VOID
-#define VOID                    void
+typedef void                    VOID;
 typedef int64_t                 INTN;
 typedef uint64_t                UINTN;
 
diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
index 835e0b9..e454ed2 100644
--- a/inc/x86_64/efibind.h
+++ b/inc/x86_64/efibind.h
@@ -96,9 +96,10 @@ Revision History
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -109,17 +110,14 @@ typedef int64_t    INT64;
 #endif
 
 typedef uint16_t   UINT16;
-typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
 
 typedef uint8_t    UINT8;
 typedef char       CHAR8;
 typedef int8_t     INT8;
 
-typedef __WCHAR_TYPE__ WCHAR;
-
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int64_t    INTN;