X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/c41ed02688c7d0eea7fe888ba996b3a9165df529..125ddee8ebdbac0f8fe3618e922198189bc47825:/makedef.pl

diff --git a/makedef.pl b/makedef.pl
index dbd756d..10c7d1e 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -129,7 +129,7 @@ if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'n
     $define{USE_REENTRANT_API} = 1;
 }
 
-if (     $define{USE_ITHREADS}
+if (    ($define{USE_ITHREADS} || $define{USE_THREAD_SAFE_LOCALE})
     &&   $define{HAS_SETLOCALE}
     && ! $define{NO_LOCALE}
     && ! $define{NO_POSIX_2008_LOCALE})
@@ -283,7 +283,6 @@ unless ($define{'DEBUGGING'}) {
 		    Perl_hv_assert
 		    PL_watchaddr
 		    PL_watchok
-		    PL_watch_pvx
 			 );
 }
 
@@ -352,6 +351,8 @@ if ($define{'PERL_USE_SAFE_PUTENV'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{PL_thr_key};
+    ++$skip{PL_user_prop_mutex};
+    ++$skip{PL_user_def_props_aTHX};
 }
 
 # USE_5005THREADS symbols. Kept as reference for easier removal
@@ -386,7 +387,6 @@ unless ($define{'USE_ITHREADS'}) {
     ++$skip{$_} foreach qw(
                     PL_keyword_plugin_mutex
 		    PL_check_mutex
-                    PL_curlocales
 		    PL_op_mutex
 		    PL_regex_pad
 		    PL_regex_padav
@@ -425,10 +425,18 @@ unless ($define{'USE_ITHREADS'}) {
 		    Perl_stashpv_hvname_match
 		    Perl_regdupe_internal
 		    Perl_newPADOP
-                    PL_C_locale_obj
 			 );
 }
 
+if (      $define{NO_LOCALE}
+    || (! $define{USE_ITHREADS} && ! $define{USE_THREAD_SAFE_LOCALE}))
+{
+    ++$skip{$_} foreach qw(
+        PL_C_locale_obj
+        PL_curlocales
+    );
+}
+
 unless ( $define{'HAS_NEWLOCALE'}
     &&   $define{'HAS_FREELOCALE'}
     &&   $define{'HAS_USELOCALE'}
@@ -446,6 +454,7 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
 		    PL_my_cxt_list
 		    PL_my_cxt_size
 		    PL_my_cxt_keys
+		    PL_my_cxt_keys_size
 		    Perl_croak_nocontext
 		    Perl_die_nocontext
 		    Perl_deb_nocontext
@@ -472,12 +481,6 @@ if ($define{USE_THREAD_SAFE_LOCALE}) {
     }
 }
 
-unless ($define{'PERL_OP_PARENT'}) {
-    ++$skip{$_} foreach qw(
-		    Perl_op_parent
-                );
-}
-
 unless ($define{'USE_DTRACE'}) {
     ++$skip{$_} foreach qw(
                     Perl_dtrace_probe_call
@@ -533,6 +536,7 @@ unless ($define{'PERL_GLOBAL_STRUCT'}) {
 unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) {
     ++$skip{$_} foreach qw(
 		    PL_my_cxt_keys
+		    PL_my_cxt_keys_size
 		    Perl_my_cxt_index
 			 );
 }
@@ -574,6 +578,9 @@ unless ($define{USE_LOCALE_COLLATE}) {
 		    PL_collxfrm_mult
 		    Perl_sv_collxfrm
 		    Perl_sv_collxfrm_flags
+                    PL_strxfrm_NUL_replacement
+                    PL_strxfrm_is_behaved
+                    PL_strxfrm_max_cp
 			 );
 }
 
@@ -583,6 +590,9 @@ unless ($define{USE_LOCALE_NUMERIC}) {
 		    PL_numeric_name
 		    PL_numeric_radix_sv
 		    PL_numeric_standard
+                    PL_numeric_underlying
+                    PL_numeric_underlying_is_standard
+                    PL_underlying_numeric_obj
 			 );
 }
 
@@ -892,6 +902,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
 			    win32_realloc
 			    win32_free
 			    win32_sleep
+			    win32_pause
 			    win32_times
 			    win32_access
 			    win32_alarm