summaryrefslogtreecommitdiff
path: root/embed.fnc
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2022-10-06 07:39:22 -0600
committerKarl Williamson <khw@cpan.org>2022-10-10 13:12:22 -0600
commit3d98f1ca6f83069d8236ff0d463a9540f5e8a15d (patch)
tree77510c1b2d8cfde54a5ca4bf530d14d31b144f74 /embed.fnc
parentc7ba79efb84b74aa37da9822b2ce4382ee3f86db (diff)
downloadperl-3d98f1ca6f83069d8236ff0d463a9540f5e8a15d.tar.gz
locale.c: Meld two functions into one
There is code in locale.c to emulate POSIX 'setlocale(foo, "")'. And there is separate code to emulate this on Windows. This commit collapses them, ensuring the same algorithm is used on both systems.
Diffstat (limited to 'embed.fnc')
-rw-r--r--embed.fnc5
1 files changed, 3 insertions, 2 deletions
diff --git a/embed.fnc b/embed.fnc
index 0e663f02b2..4edb6a507c 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -3401,14 +3401,15 @@ S |void |less_dicey_void_setlocale_i \
|const line_t line
# endif
# endif
-# if defined(USE_POSIX_2008_LOCALE) && ! defined(USE_QUERYLOCALE)
+# if defined(WIN32) || ( defined(USE_POSIX_2008_LOCALE) \
+ && ! defined(USE_QUERYLOCALE))
S |const char *|find_locale_from_environment|const unsigned int index
# endif
# if defined(USE_POSIX_2008_LOCALE) && defined(USE_QUERYLOCALE)
S |const char *|calculate_LC_ALL|const locale_t cur_obj
# else
: regen/embed.pl can't currently cope with 'elif'
-# if defined(USE_POSIX_2008_LOCALE) || ! defined(LC_ALL)
+# if defined(WIN32) || defined(USE_POSIX_2008_LOCALE) || ! defined(LC_ALL)
S |const char *|calculate_LC_ALL|NN const char ** individ_locales
# endif
# endif