From d94aa97e72e6998a85674583fa0859e2a3a7fa42 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Fri, 2 Sep 2022 07:10:33 -0600 Subject: [PATCH] intrpvar.h,sv.c,perl.c: Remove unnecessary cpp condition This conditional dates from when the rest of the conditions used 'HAS_foo' (from config.h) instead of USE_foo, which takes more things into account. --- intrpvar.h | 1 - perl.c | 4 +--- sv.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/intrpvar.h b/intrpvar.h index 75bba1d..81a15ad 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -739,7 +739,6 @@ PERLVAR(I, constpadix, PADOFFSET) /* lowest unused for constants */ PERLVAR(I, padix_floor, PADOFFSET) /* how low may inner block reset padix */ #if defined(USE_POSIX_2008_LOCALE) \ - && defined(USE_THREAD_SAFE_LOCALE) \ && ! defined(USE_QUERYLOCALE) /* This is the most number of categories we've encountered so far on any diff --git a/perl.c b/perl.c index 343c117..17b16f6 100644 --- a/perl.c +++ b/perl.c @@ -1119,9 +1119,7 @@ perl_destruct(pTHXx) Safefree(PL_collation_name); PL_collation_name = NULL; #endif -#if defined(USE_POSIX_2008_LOCALE) \ - && defined(USE_THREAD_SAFE_LOCALE) \ - && ! defined(HAS_QUERYLOCALE) +#if defined(USE_POSIX_2008_LOCALE) && ! defined(USE_QUERYLOCALE) for (i = 0; i < (int) C_ARRAY_LENGTH(PL_curlocales); i++) { Safefree(PL_curlocales[i]); PL_curlocales[i] = NULL; diff --git a/sv.c b/sv.c index 81d6a4b..b4903de 100644 --- a/sv.c +++ b/sv.c @@ -15905,9 +15905,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_subname = sv_dup_inc(proto_perl->Isubname, param); -#if defined(USE_POSIX_2008_LOCALE) \ - && defined(USE_THREAD_SAFE_LOCALE) \ - && ! defined(HAS_QUERYLOCALE) +#if defined(USE_POSIX_2008_LOCALE) && ! defined(USE_QUERYLOCALE) for (i = 0; i < (int) C_ARRAY_LENGTH(PL_curlocales); i++) { PL_curlocales[i] = SAVEPV(proto_perl->Icurlocales[i]); } -- 1.8.3.1