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 | |
| 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>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/Main.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 02e78e412..f5b7ad88a 100644 --- a/meson.build +++ b/meson.build @@ -147,8 +147,6 @@ add_global_arguments(common_cppflags, language: 'cpp') enable_daemon = not is_windows and not is_android and get_option('daemon') conf.set('ENABLE_DAEMON', enable_daemon) -conf.set('HAVE_CLOCALE', compiler.has_header('clocale')) - conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r')) conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r')) conf.set('HAVE_INITGROUPS', compiler.has_function('initgroups')) 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; |