From 6a4065f28f30d59e3a6cea6504be34bdb5e5eb8b Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 3 Oct 2022 08:33:55 -0600 Subject: locale: Create special variable to hold current LC_ALL Some configurations require us to store the current locale for each category. Prior to this commit, this was done in the array PL_curlocales, with the entry for LC_ALL being in the highest element. Future commits will need just the value for LC_ALL in some other configurations, without needing the rest of the array. This commit splits off the LC_ALL element into its own per-interpreter variable to accommodate those. It always had to have special handling anyway beyond the rest of the array elements, --- intrpvar.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'intrpvar.h') diff --git a/intrpvar.h b/intrpvar.h index a975977729..75347aba77 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -741,8 +741,13 @@ PERLVAR(I, padix_floor, PADOFFSET) /* how low may inner block reset padix */ #ifdef USE_PL_CURLOCALES /* This is the most number of categories we've encountered so far on any - * platform */ -PERLVARA(I, curlocales, 12, const char *) + * platform, doesn't include LC_ALL */ +PERLVARA(I, curlocales, 11, const char *) + +#endif +#ifdef USE_PL_CUR_LC_ALL + +PERLVARI(I, cur_LC_ALL, const char *, NULL) #endif #ifdef USE_LOCALE_COLLATE -- cgit v1.2.1