Merge /u/gmbr3/gnu-efi/ branch CHAR16 into master
https://sourceforge.net/p/gnu-efi/code/merge-requests/48/
This commit is contained in:
commit
dcced03469
@ -38,12 +38,10 @@ typedef int64_t intptr_t;
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef __WCHAR_TYPE__
|
#include <stddef.h>
|
||||||
# define __WCHAR_TYPE__ short
|
|
||||||
#endif
|
typedef wchar_t CHAR16;
|
||||||
#ifndef __CHAR16_TYPE__
|
#define WCHAR CHAR16
|
||||||
# define __CHAR16_TYPE__ unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -52,17 +50,14 @@ typedef uint32_t UINT32;
|
|||||||
typedef int32_t INT32;
|
typedef int32_t INT32;
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
typedef int64_t INTN;
|
typedef int64_t INTN;
|
||||||
typedef uint64_t UINTN;
|
typedef uint64_t UINTN;
|
||||||
|
@ -46,12 +46,10 @@ typedef int32_t intptr_t;
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef __WCHAR_TYPE__
|
#include <stddef.h>
|
||||||
# define __WCHAR_TYPE__ short
|
|
||||||
#endif
|
typedef wchar_t CHAR16;
|
||||||
#ifndef __CHAR16_TYPE__
|
#define WCHAR CHAR16
|
||||||
# define __CHAR16_TYPE__ unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -60,17 +58,14 @@ typedef uint32_t UINT32;
|
|||||||
typedef int32_t INT32;
|
typedef int32_t INT32;
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
typedef int32_t INTN;
|
typedef int32_t INTN;
|
||||||
typedef uint32_t UINTN;
|
typedef uint32_t UINTN;
|
||||||
|
@ -85,12 +85,11 @@ Revision History
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef __WCHAR_TYPE__
|
#include <stddef.h>
|
||||||
# define __WCHAR_TYPE__ short
|
|
||||||
#endif
|
typedef wchar_t CHAR16;
|
||||||
#ifndef __CHAR16_TYPE__
|
#define WCHAR CHAR16
|
||||||
# define __CHAR16_TYPE__ unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -101,17 +100,14 @@ typedef int64_t INT64;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
|
|
||||||
typedef int32_t INTN;
|
typedef int32_t INTN;
|
||||||
|
@ -71,12 +71,11 @@ Revision History
|
|||||||
//
|
//
|
||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
#ifndef __WCHAR_TYPE__
|
|
||||||
# define __WCHAR_TYPE__ short
|
#include <stddef.h>
|
||||||
#endif
|
|
||||||
#ifndef __CHAR16_TYPE__
|
typedef wchar_t CHAR16;
|
||||||
# define __CHAR16_TYPE__ unsigned short
|
#define WCHAR CHAR16
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -85,17 +84,14 @@ typedef uint32_t UINT32;
|
|||||||
typedef int32_t INT32;
|
typedef int32_t INT32;
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
|
|
||||||
typedef int64_t INTN;
|
typedef int64_t INTN;
|
||||||
|
@ -40,12 +40,10 @@ typedef int64_t intptr_t;
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef __WCHAR_TYPE__
|
#include <stddef.h>
|
||||||
# define __WCHAR_TYPE__ short
|
|
||||||
#endif
|
typedef wchar_t CHAR16;
|
||||||
#ifndef __CHAR16_TYPE__
|
#define WCHAR CHAR16
|
||||||
# define __CHAR16_TYPE__ unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -54,17 +52,14 @@ typedef uint32_t UINT32;
|
|||||||
typedef int32_t INT32;
|
typedef int32_t INT32;
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
typedef int64_t INTN;
|
typedef int64_t INTN;
|
||||||
typedef uint64_t UINTN;
|
typedef uint64_t UINTN;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -32,15 +32,13 @@ typedef uint16_t UINT16;
|
|||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
#ifndef __WCHAR_TYPE__
|
typedef wchar_t CHAR16;
|
||||||
#define __WCHAR_TYPE__ short
|
#define WCHAR CHAR16
|
||||||
#endif
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
#ifndef BOOLEAN
|
#ifndef BOOLEAN
|
||||||
typedef uint8_t BOOLEAN;
|
typedef uint8_t BOOLEAN;
|
||||||
#endif
|
#endif
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
typedef int64_t INTN;
|
typedef int64_t INTN;
|
||||||
typedef uint64_t UINTN;
|
typedef uint64_t UINTN;
|
||||||
|
|
||||||
|
@ -96,9 +96,10 @@ Revision History
|
|||||||
// Basic EFI types of various widths
|
// Basic EFI types of various widths
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef __WCHAR_TYPE__
|
#include <stddef.h>
|
||||||
# define __WCHAR_TYPE__ short
|
|
||||||
#endif
|
typedef wchar_t CHAR16;
|
||||||
|
#define WCHAR CHAR16
|
||||||
|
|
||||||
typedef uint64_t UINT64;
|
typedef uint64_t UINT64;
|
||||||
typedef int64_t INT64;
|
typedef int64_t INT64;
|
||||||
@ -109,17 +110,14 @@ typedef int64_t INT64;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef uint16_t UINT16;
|
typedef uint16_t UINT16;
|
||||||
typedef __CHAR16_TYPE__ CHAR16;
|
|
||||||
typedef int16_t INT16;
|
typedef int16_t INT16;
|
||||||
|
|
||||||
typedef uint8_t UINT8;
|
typedef uint8_t UINT8;
|
||||||
typedef char CHAR8;
|
typedef char CHAR8;
|
||||||
typedef int8_t INT8;
|
typedef int8_t INT8;
|
||||||
|
|
||||||
typedef __WCHAR_TYPE__ WCHAR;
|
|
||||||
|
|
||||||
#undef VOID
|
#undef VOID
|
||||||
#define VOID void
|
typedef void VOID;
|
||||||
|
|
||||||
|
|
||||||
typedef int64_t INTN;
|
typedef int64_t INTN;
|
||||||
|
Loading…
Reference in New Issue
Block a user