Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define wchar_t according to __WCHAR_TYPE__ #1431

Merged
merged 1 commit into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions third_party/musl/arch/aarch64/bits/alltypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
#define __LONG_MAX 0x7fffffffffffffffL

#ifndef __cplusplus
#if defined(USE_COBALT_CUSTOMIZATIONS)
typedef __WCHAR_TYPE__ wchar_t;
#else
#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
niranjanyardi marked this conversation as resolved.
Show resolved Hide resolved
typedef unsigned wchar_t;
#define __DEFINED_wchar_t
#endif
#endif // defined(USE_COBALT_CUSTOMIZATIONS)

#endif
#if defined(__NEED_wint_t) && !defined(__DEFINED_wint_t)
Expand Down
4 changes: 4 additions & 0 deletions third_party/musl/arch/arm/bits/alltypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
#define __LONG_MAX 0x7fffffffL

#ifndef __cplusplus
#if defined(USE_COBALT_CUSTOMIZATIONS)
typedef __WCHAR_TYPE__ wchar_t;
#else
#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
typedef unsigned wchar_t;
#define __DEFINED_wchar_t
#endif
#endif // defined(USE_COBALT_CUSTOMIZATIONS)

#endif

Expand Down
6 changes: 4 additions & 2 deletions third_party/musl/arch/x86_64/bits/alltypes.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
#define _Addr long
#define _Int64 long
#define _Reg long

#define __BYTE_ORDER 1234
#define __LONG_MAX 0x7fffffffffffffffL

#ifndef __cplusplus
#if defined(USE_COBALT_CUSTOMIZATIONS)
typedef __WCHAR_TYPE__ wchar_t;
#else
#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
typedef int wchar_t;
#define __DEFINED_wchar_t
#endif

#endif // defined(USE_COBALT_CUSTOMIZATIONS)
#endif

#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
Expand Down
Loading