Skip to content

Commit

Permalink
Merge branch 'Calandracas606-musl-locale' into devel
Browse files Browse the repository at this point in the history
* Fixed build for musl library (contributed by Daniel Martinez).
  • Loading branch information
sadko4u committed Oct 14, 2024
2 parents c290418 + f48778f commit 7424aaf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*******************************************************************************

=== 1.0.40 ===

* Fixed build for musl library (contributed by Daniel Martinez).

=== 1.0.39 ===
* Updated build scripts.
Expand Down
14 changes: 12 additions & 2 deletions src/main/locale.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,24 @@ namespace lsp
case LC_MONETARY: flags = LC_MONETARY_MASK; break;
case LC_MESSAGES: flags = LC_MESSAGES_MASK; break;
case LC_ALL: flags = LC_ALL_MASK; break;
#if defined(PLATFORM_LINUX)
#if defined(LC_PAPER)
case LC_PAPER: flags = LC_PAPER_MASK; break;
#endif
#if defined(LC_NAME)
case LC_NAME: flags = LC_NAME_MASK; break;
#endif
#if defined(LC_ADDRESS)
case LC_ADDRESS: flags = LC_ADDRESS_MASK; break;
#endif
#if defined(LC_TELEPHONE)
case LC_TELEPHONE: flags = LC_TELEPHONE_MASK; break;
#endif
#if defined(LC_MEASUREMENT)
case LC_MEASUREMENT: flags = LC_MEASUREMENT_MASK; break;
#endif
#if defined(LC_IDENTIFICATION)
case LC_IDENTIFICATION: flags = LC_IDENTIFICATION_MASK; break;
#endif /* PLATFORM_LINUX */
#endif

default:
return INVALID_LOCALE;
Expand Down

0 comments on commit 7424aaf

Please sign in to comment.