diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-09 13:50:33 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-09 13:51:02 +0800 |
| commit | 8805e0666318f52bc9c29a104fb257268964667a (patch) | |
| tree | ad3146cd0c12d405569eadf41392bbebd3cf9c2e /src | |
| parent | da67b75c5cd747acd7fd662b0af20e67fd9670be (diff) | |
| parent | fdd71448e78f442ffd93a3a3398a5062eaba9f1b (diff) | |
| download | bitcoin-8805e0666318f52bc9c29a104fb257268964667a.tar.xz | |
Merge bitcoin/bitcoin#22390: system: skip trying to set the locale on NetBSD
fdd71448e78f442ffd93a3a3398a5062eaba9f1b system: skip trying to set the locale on NetBSD (fanquake)
Pull request description:
Just treat it the same as the other BSDs.
Fixes #17379.
ACKs for top commit:
laanwj:
Code review ACK fdd71448e78f442ffd93a3a3398a5062eaba9f1b
practicalswift:
cr ACK fdd71448e78f442ffd93a3a3398a5062eaba9f1b
Tree-SHA512: 5fe0a66f014279ad2683b548692a36af493377fb92d1f28b15dc4feef871190fe08ef40dcc4f5ba21a525fe365c42fb429fe4be0673a1e96db163af587c23204
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/system.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 4e16a83c87..08f62f1da7 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1306,7 +1306,7 @@ void SetupEnvironment() #endif // On most POSIX systems (e.g. Linux, but not BSD) the environment's locale // may be invalid, in which case the "C.UTF-8" locale is used as fallback. -#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) try { std::locale(""); // Raises a runtime error if current locale is invalid } catch (const std::runtime_error&) { |