From 980e32f69cf97952f38cf295d3d0f063e3486fd9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 29 Sep 2020 14:51:17 -0700 Subject: [PATCH] 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 --- meson.build | 2 -- src/Main.cxx | 4 +--- 2 files changed, 1 insertion(+), 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 -#ifdef HAVE_CLOCALE +#ifndef ANDROID #include #endif @@ -358,11 +358,9 @@ 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;