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>

remove clocale test
980e32f6 · Rosen Penev · 65d25767 · 980e32f6 · 980e32f6
Unverified Commit 980e32f6 authored Sep 29, 2020 by Rosen Penev
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

meson.build meson.build +0 -2

Main.cxx src/Main.cxx +1 -3

No files found.
--- 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'))

--- 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;