if no localeconv

Perl · Nov 20, 2023 · fa75726 · fa75726
1 parent 4d48fc1
commit fa75726
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 98 deletions.
diff --git a/embed.fnc b/embed.fnc
@@ -4399,22 +4399,20 @@ S	|void	|ints_to_tm	|NN struct tm *my_tm			\
 				|int yday				\
 				|int isdst
 S	|bool	|is_locale_utf8 |NN const char *locale
-S	|char * |strftime8	|NN const char *fmt			\
-				|NN const struct tm *mytm		\
-				|const utf8ness_t fmt_utf8ness		\
-				|NN utf8ness_t *result_utf8ness 	\
-				|const bool came_from_sv
-Sf	|char * |strftime_tm	|NN const char *fmt			\
-				|NN const struct tm *mytm
-# if defined(HAS_LOCALECONV)
 S	|HV *	|my_localeconv	|const int item
 S	|void	|populate_hash_from_C_localeconv			\
 				|NN HV *hv				\
 				|NN const char *locale			\
 				|const PERL_UINT_FAST8_T which_mask	\
 				|NN const lconv_offset_t *strings[2]	\
 				|NN const lconv_offset_t *integers[2]
-# endif
+S	|char * |strftime8	|NN const char *fmt			\
+				|NN const struct tm *mytm		\
+				|const utf8ness_t fmt_utf8ness		\
+				|NN utf8ness_t *result_utf8ness 	\
+				|const bool came_from_sv
+Sf	|char * |strftime_tm	|NN const char *fmt			\
+				|NN const struct tm *mytm
 # if defined(USE_LOCALE)
 S	|const char *|calculate_LC_ALL_string					\
 				|NULLOK const char **category_locales_list	\

diff --git a/embed.h b/embed.h
@@ -1299,12 +1299,10 @@
 #     define get_locale_string_utf8ness_i(a,b,c,d) S_get_locale_string_utf8ness_i(aTHX_ a,b,c,d)
 #     define ints_to_tm(a,b,c,d,e,f,g,h,i,j)    S_ints_to_tm(aTHX_ a,b,c,d,e,f,g,h,i,j)
 #     define is_locale_utf8(a)                  S_is_locale_utf8(aTHX_ a)
+#     define my_localeconv(a)                   S_my_localeconv(aTHX_ a)
+#     define populate_hash_from_C_localeconv(a,b,c,d,e) S_populate_hash_from_C_localeconv(aTHX_ a,b,c,d,e)
 #     define strftime8(a,b,c,d,e)               S_strftime8(aTHX_ a,b,c,d,e)
 #     define strftime_tm(a,b)                   S_strftime_tm(aTHX_ a,b)
-#     if defined(HAS_LOCALECONV)
-#       define my_localeconv(a)                 S_my_localeconv(aTHX_ a)
-#       define populate_hash_from_C_localeconv(a,b,c,d,e) S_populate_hash_from_C_localeconv(aTHX_ a,b,c,d,e)
-#     endif
 #     if defined(USE_LOCALE)
 #       define calculate_LC_ALL_string(a,b,c,d) S_calculate_LC_ALL_string(aTHX_ a,b,c,d)
 #       define get_category_index_helper(a,b,c) S_get_category_index_helper(aTHX_ a,b,c)