Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cordon off glibc locale vars just for glibc 2.2

Browse source 
Phew
This commit is contained in:
Aaron Gyes 2021-12-13 01:56:48 -08:00
parent b05757ee56
commit 7a80ad74f4
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/env_dispatch.cpp
View file

@ -62,22 +62,28 @@
/// List of all locale environment variable names that might trigger (re)initializing the locale /// List of all locale environment variable names that might trigger (re)initializing the locale
/// subsystem. /// subsystem.
static const wcstring locale_variables[] = {L"LANG", static const wcstring locale_variables[] = {L"LANG",
L"LANGUAGE",
L"LC_ALL", L"LC_ALL",
L"LC_ADDRESS",
L"LC_COLLATE", L"LC_COLLATE",
L"LC_CTYPE", L"LC_CTYPE",
L"LC_IDENTIFICATION",
L"LC_MEASUREMENT",
L"LC_MESSAGES", L"LC_MESSAGES",
L"LC_MONETARY", L"LC_MONETARY",
L"LC_NAME",
L"LC_NUMERIC", L"LC_NUMERIC",
L"LC_TIME",
#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2,2)
L"LANGUAGE", /* GNU libc extensions start */
L"LC_ADDRESS",
L"LC_IDENTIFICATION",
L"LC_MEASUREMENT",
L"LC_NAME",
L"LC_PAPER", L"LC_PAPER",
L"LC_TELEPHONE", L"LC_TELEPHONE",
L"LC_TIME", L"LOCPATH", /* GNU libc extensions end */
L"fish_allow_singlebyte_locale", #endif // __GLIBC_PREREQ(2,2)
L"LOCPATH"}; #endif // defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
L"fish_allow_singlebyte_locale"
};
/// List of all curses environment variable names that might trigger (re)initializing the curses /// List of all curses environment variable names that might trigger (re)initializing the curses
/// subsystem. /// subsystem.