Skip to content

Commit dd55c28

Browse files
committed
Avoid conflicting efi_char16_t type definitions
It's not necessary to define 'efi_char16_t' as 'wchar_t' since we don't need any wchar functions. Besides, it may conflict with efivar-38. This commit defines 'efi_char16_t' as 'uint16_t' and adds the conditional check to avoid the potential conflict. Fixes: #66 Signed-off-by: Gary Lin <[email protected]>
1 parent ae59d89 commit dd55c28

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/mokutil.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@
3333
#define __MOKUTIL_H__
3434

3535
#include <ctype.h>
36-
#include <wchar.h>
3736

3837
#include "signature.h"
3938

4039
typedef unsigned long efi_status_t;
4140
typedef uint8_t efi_bool_t;
42-
typedef wchar_t efi_char16_t; /* UNICODE character */
41+
#ifndef efi_char16_t
42+
typedef uint16_t efi_char16_t; /* UNICODE character */
43+
#endif
4344

4445
typedef enum {
4546
DELETE_MOK = 0,

0 commit comments

Comments
 (0)