Skip to content

Commit

Permalink
Fix wxUILocale compilation with musl
Browse files Browse the repository at this point in the history
Avoid using glibc specific defines when using musl, which does not
provide glibc-only enum members such as _NL_ADDRESS_LANG_NAME.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

See wxWidgets#23050.

(cherry picked from commit 1faf179)
  • Loading branch information
kraj authored and vadz committed Jan 26, 2023
1 parent af2f7f2 commit 7163630
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ All:
- Fix MT-safety problem in wxZipInputStream (#23054).
- Fix building all samples in release build with CMake (#23106).
- Fix using pkg-config when cross-compiling (#22886, #23037, #23171).
- Fix compilation problem in wxUILocale code when using musl (Khem Raj, #23050).

All (GUI):

Expand Down
2 changes: 1 addition & 1 deletion src/unix/uilocale.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ wxString
wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
{
wxString str;
#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
switch (name)
{
case wxLOCALE_NAME_LOCALE:
Expand Down

0 comments on commit 7163630

Please sign in to comment.