From fcbef0e88b4eade993ab05b0c51334391a265233 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 1 Aug 2022 16:42:31 -0600 Subject: intrpvar.h: Fix when certain locale symbols get defined Certain interpreter variables are needed only in certain Configurations. This commit removes some that aren't needed everywhere to be generated only where they are needed, and generates some that weren't being used that are or will be needed everywhere by follow-up commits. --- intrpvar.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'intrpvar.h') diff --git a/intrpvar.h b/intrpvar.h index 58fa5a4b9c..d35dccb88f 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -810,23 +810,19 @@ PERLVAR(I, pad_reset_pending, bool) /* reset pad on next attempted alloc */ PERLVAR(I, srand_called, bool) -#ifdef USE_LOCALE_NUMERIC - PERLVARI(I, numeric_underlying, bool, TRUE) /* Assume underlying locale numerics */ PERLVARI(I, numeric_underlying_is_standard, bool, TRUE) -PERLVARI(I, numeric_standard, int, TRUE) - /* Assume C locale numerics */ -PERLVAR(I, numeric_name, char *) /* Name of current numeric locale */ +PERLVARI(I, numeric_standard, int, TRUE) /* Assume C locale numerics */ +PERLVAR(I, numeric_name, char *) /* Name of current numeric locale */ PERLVAR(I, numeric_radix_sv, SV *) /* The radix separator if not '.' */ -# ifdef USE_POSIX_2008_LOCALE +#if defined(USE_LOCALE_NUMERIC) && defined(USE_POSIX_2008_LOCALE) PERLVARI(I, underlying_numeric_obj, locale_t, NULL) -# endif -#endif /* !USE_LOCALE_NUMERIC */ +#endif /* Array of signal handlers, indexed by signal number, through which the C signal handler dispatches. */ -- cgit v1.2.1