Commit 71e551df authored by Rosen Penev's avatar Rosen Penev

replace locale.h with clocale

Switch to std:: functions. Changed the meson check. Works locally. Signed-off-by: 's avatarRosen Penev <rosenp@gmail.com>
parent 3540cf26
...@@ -145,7 +145,7 @@ add_global_arguments(common_cppflags, language: 'cpp') ...@@ -145,7 +145,7 @@ add_global_arguments(common_cppflags, language: 'cpp')
enable_daemon = not is_windows and not is_android and get_option('daemon') enable_daemon = not is_windows and not is_android and get_option('daemon')
conf.set('ENABLE_DAEMON', enable_daemon) conf.set('ENABLE_DAEMON', enable_daemon)
conf.set('HAVE_LOCALE_H', compiler.has_header('locale.h')) conf.set('HAVE_CLOCALE', compiler.has_header('clocale'))
conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r')) conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r'))
conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r')) conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r'))
......
...@@ -109,14 +109,12 @@ ...@@ -109,14 +109,12 @@
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#endif #endif
#include <stdlib.h> #include <climits>
#ifdef HAVE_LOCALE_H #ifdef HAVE_CLOCALE
#include <locale.h> #include <clocale>
#endif #endif
#include <climits>
static constexpr size_t KILOBYTE = 1024; static constexpr size_t KILOBYTE = 1024;
static constexpr size_t MEGABYTE = 1024 * KILOBYTE; static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
...@@ -360,10 +358,10 @@ MainConfigured(const struct options &options, const ConfigData &raw_config) ...@@ -360,10 +358,10 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
#endif #endif
#ifndef ANDROID #ifndef ANDROID
#ifdef HAVE_LOCALE_H #ifdef HAVE_CLOCALE
/* initialize locale */ /* initialize locale */
setlocale(LC_CTYPE,""); std::setlocale(LC_CTYPE,"");
setlocale(LC_COLLATE, ""); std::setlocale(LC_COLLATE, "");
#endif #endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment