Skip to content

[libc++] Fix the locale base API on Linux with musl #128936

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 28, 2025
Merged

[libc++] Fix the locale base API on Linux with musl #128936

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fbb3b0
[libcxx] avoid the "_l" calls on musl platforms
pirama-arumuga-nainar Feb 26, 2025
98f7dc5
Apply suggestions from code review
ldionne Feb 26, 2025
641e1c2
Use "_LIBCPP_HAS_MUSL_LIBC" directly
androm3da Feb 27, 2025
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
10 changes: 10 additions & 0 deletions libcxx/include/__locale_dir/support/linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,22 @@ inline _LIBCPP_HIDE_FROM_ABI long double __strtold(const char* __nptr, char** __
}

inline _LIBCPP_HIDE_FROM_ABI long long __strtoll(const char* __nptr, char** __endptr, int __base, __locale_t __loc) {
#if !_LIBCPP_HAS_MUSL_LIBC
return ::strtoll_l(__nptr, __endptr, __base, __loc);
#else
(void)__loc;
return ::strtoll(__nptr, __endptr, __base);
#endif
}

inline _LIBCPP_HIDE_FROM_ABI unsigned long long
__strtoull(const char* __nptr, char** __endptr, int __base, __locale_t __loc) {
#if !_LIBCPP_HAS_MUSL_LIBC
return ::strtoull_l(__nptr, __endptr, __base, __loc);
#else
(void)__loc;
return ::strtoull(__nptr, __endptr, __base);
#endif
}

//
Expand Down