mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make WCHAR and CHAR16 identical

Browse Source 
And actually use wchar_t
gnu-efi already uses L string literals which are of type
wchar_t

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
This commit is contained in:
Callum Farmer 2023-04-08 19:43:42 +01:00
parent 4f8b339fac
commit 189200d0b0
7 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inc/aarch64/efibind.h
View File

@ -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,15 +50,12 @@ 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

13
inc/arm/efibind.h
View File

@ -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,15 +58,12 @@ 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

14
inc/ia32/efibind.h
View File

@ -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,15 +100,12 @@ 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

14
inc/ia64/efibind.h
View File

@ -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,15 +84,12 @@ 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

13
inc/mips64el/efibind.h
View File

@ -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,15 +52,12 @@ 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

8
inc/riscv64/efibind.h
View File

@ -22,7 +22,7 @@
// Basic EFI types of various widths
//
#include <stddef.h>
typedef uint64_t UINT64;
typedef int64_t INT64;
@ -32,10 +32,8 @@ 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

10
inc/x86_64/efibind.h
View File

@ -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,15 +110,12 @@ 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