Skip to content

Commit 8805e06

Browse files
committed
Merge bitcoin/bitcoin#22390: system: skip trying to set the locale on NetBSD
fdd7144 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 fdd7144 practicalswift: cr ACK fdd7144 Tree-SHA512: 5fe0a66f014279ad2683b548692a36af493377fb92d1f28b15dc4feef871190fe08ef40dcc4f5ba21a525fe365c42fb429fe4be0673a1e96db163af587c23204
2 parents da67b75 + fdd7144 commit 8805e06

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/util/system.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ void SetupEnvironment()
13061306
#endif
13071307
// On most POSIX systems (e.g. Linux, but not BSD) the environment's locale
13081308
// may be invalid, in which case the "C.UTF-8" locale is used as fallback.
1309-
#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
1309+
#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
13101310
try {
13111311
std::locale(""); // Raises a runtime error if current locale is invalid
13121312
} catch (const std::runtime_error&) {

0 commit comments

Comments
 (0)