diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-09-29 14:51:17 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-09-29 14:51:17 -0700 |
| commit | 980e32f69cf97952f38cf295d3d0f063e3486fd9 (patch) | |
| tree | 93a4e1ef027a2c63554e8a9fb1a183ce7b37e571 /src/Main.cxx | |
| parent | 65d257675ff42de016a394910d0d39ec59cfc527 (diff) | |
remove clocale test
clocale is part of C++11.
In practical terms, gcc's libstdc++ comes with its own locale defines
when the libc does not have them.
Also reworked to be dependent on !ANDROID.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'src/Main.cxx')
| -rw-r--r-- | src/Main.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 5cf7037e7..c96dac4b7 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -111,7 +111,7 @@ #include <climits> -#ifdef HAVE_CLOCALE +#ifndef ANDROID #include <clocale> #endif @@ -358,12 +358,10 @@ MainConfigured(const struct options &options, const ConfigData &raw_config) #endif #ifndef ANDROID -#ifdef HAVE_CLOCALE /* initialize locale */ std::setlocale(LC_CTYPE,""); std::setlocale(LC_COLLATE, ""); #endif -#endif const ScopeIcuInit icu_init; const ScopeNetInit net_init; |