mirror of https://github.com/ncroxon/gnu-efi
Make CHAR8 and similar be defined the same way edk2 does it.
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
b9c4b23d90
commit
14899d899b
|
@ -41,6 +41,9 @@ typedef int64_t intptr_t;
|
|||
#ifndef __WCHAR_TYPE__
|
||||
# define __WCHAR_TYPE__ short
|
||||
#endif
|
||||
#ifndef __CHAR16_TYPE__
|
||||
# define __CHAR16_TYPE__ unsigned short
|
||||
#endif
|
||||
|
||||
typedef uint64_t UINT64;
|
||||
typedef int64_t INT64;
|
||||
|
@ -49,9 +52,13 @@ 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
|
||||
|
|
|
@ -49,6 +49,9 @@ typedef int32_t intptr_t;
|
|||
#ifndef __WCHAR_TYPE__
|
||||
# define __WCHAR_TYPE__ short
|
||||
#endif
|
||||
#ifndef __CHAR16_TYPE__
|
||||
# define __CHAR16_TYPE__ unsigned short
|
||||
#endif
|
||||
|
||||
typedef uint64_t UINT64;
|
||||
typedef int64_t INT64;
|
||||
|
@ -57,9 +60,13 @@ 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
|
||||
|
|
|
@ -20,9 +20,8 @@ Revision History
|
|||
|
||||
--*/
|
||||
|
||||
typedef UINT16 CHAR16;
|
||||
typedef UINT8 CHAR8;
|
||||
typedef UINT8 BOOLEAN;
|
||||
typedef unsigned char BOOLEAN;
|
||||
|
||||
#ifndef CONST
|
||||
#define CONST const
|
||||
#endif
|
||||
|
@ -194,7 +193,7 @@ typedef struct {
|
|||
// International Language
|
||||
//
|
||||
|
||||
typedef UINT8 ISO_639_2;
|
||||
typedef CHAR8 ISO_639_2;
|
||||
#define ISO_639_2_ENTRY_SIZE 3
|
||||
|
||||
//
|
||||
|
|
|
@ -88,6 +88,9 @@ Revision History
|
|||
#ifndef __WCHAR_TYPE__
|
||||
# define __WCHAR_TYPE__ short
|
||||
#endif
|
||||
#ifndef __CHAR16_TYPE__
|
||||
# define __CHAR16_TYPE__ unsigned short
|
||||
#endif
|
||||
|
||||
typedef uint64_t UINT64;
|
||||
typedef int64_t INT64;
|
||||
|
@ -98,9 +101,13 @@ 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
|
||||
|
|
|
@ -74,18 +74,25 @@ Revision History
|
|||
#ifndef __WCHAR_TYPE__
|
||||
# define __WCHAR_TYPE__ short
|
||||
#endif
|
||||
|
||||
#ifndef __CHAR16_TYPE__
|
||||
# define __CHAR16_TYPE__ unsigned short
|
||||
#endif
|
||||
|
||||
typedef uint64_t UINT64;
|
||||
typedef int64_t INT64;
|
||||
|
||||
typedef uint32_t UINT32;
|
||||
typedef int32_t INT32;
|
||||
typedef uint16_t UINT16;
|
||||
typedef int16_t INT16;
|
||||
typedef uint8_t UINT8;
|
||||
typedef int8_t INT8;
|
||||
typedef __WCHAR_TYPE__ WCHAR;
|
||||
|
||||
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
|
||||
|
|
|
@ -43,6 +43,9 @@ typedef int64_t intptr_t;
|
|||
#ifndef __WCHAR_TYPE__
|
||||
# define __WCHAR_TYPE__ short
|
||||
#endif
|
||||
#ifndef __CHAR16_TYPE__
|
||||
# define __CHAR16_TYPE__ unsigned short
|
||||
#endif
|
||||
|
||||
typedef uint64_t UINT64;
|
||||
typedef int64_t INT64;
|
||||
|
@ -51,9 +54,13 @@ 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
|
||||
|
|
|
@ -109,9 +109,13 @@ 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
|
||||
|
|
Loading…
Reference in New Issue