Skip to content

Commit 38daa6d

Browse files
authored
[libc] build fix: always use our char8_t headers even in overlay mode (#144433)
Build fix caused by certain platforms not providing char8_t when expected Temporary fix to just always use our own definition, even in overlay mode.
1 parent 60a59e3 commit 38daa6d

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

libc/hdr/types/char8_t.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@
99
#ifndef LLVM_LIBC_HDR_TYPES_CHAR8_T_H
1010
#define LLVM_LIBC_HDR_TYPES_CHAR8_T_H
1111

12-
#ifdef LIBC_FULL_BUILD
13-
1412
#include "include/llvm-libc-types/char8_t.h"
1513

16-
#else // overlay mode
17-
18-
#include "hdr/uchar_overlay.h"
19-
20-
#endif // LLVM_LIBC_FULL_BUILD
21-
2214
#endif // LLVM_LIBC_HDR_TYPES_CHAR8_T_H

libc/src/__support/wchar/character_converter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ErrorOr<char8_t> CharacterConverter::pop_utf8() {
7070
char32_t output;
7171

7272
// Shift to get the next 6 bits from the utf32 encoding
73-
const char32_t shift_amount =
73+
const size_t shift_amount =
7474
(state->total_bytes - state->bytes_processed - 1) * ENCODED_BITS_PER_UTF8;
7575
if (state->bytes_processed == 0) {
7676
/*

0 commit comments

Comments
 (0)