X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/999d65ede909a162fb0accd370ffdf1411e94d5e..dc37125bb824744e1f528311ca37da59913cda7d:/perlvars.h

diff --git a/perlvars.h b/perlvars.h
index d8139c0..976649a 100644
--- a/perlvars.h
+++ b/perlvars.h
@@ -73,8 +73,13 @@ PERLVARI(G, sig_trapped, int,	0)
 /* If Perl has to ignore SIGPFE, this is its saved state.
  * See perl.h macros PERL_FPU_INIT and PERL_FPU_{PRE,POST}_EXEC. */
 PERLVAR(G, sigfpe_saved, Sighandler_t)
-PERLVARI(G, csighandlerp, Sighandler_t, Perl_csighandler)
-					/* Pointer to C-level sighandler */
+
+/* these ptrs to functions are to avoid linkage problems; see
+ * perl-5.8.0-2193-g5c1546dc48
+ */
+PERLVARI(G, csighandlerp,  Sighandler_t,  Perl_csighandler)
+PERLVARI(G, csighandler1p, Sighandler1_t, Perl_csighandler1)
+PERLVARI(G, csighandler3p, Sighandler3_t, Perl_csighandler3)
 #endif
 
 /* This is constant on most architectures, a global on OS/2 */
@@ -111,12 +116,10 @@ PERLVAR(G, lc_numeric_mutex, perl_mutex)   /* Mutex for switching LC_NUMERIC */
 PERLVAR(G, C_locale_obj, locale_t)
 #endif
 
-#ifdef DEBUGGING
 PERLVARI(G, watch_pvx,	char *, NULL)
-#endif
 
 /*
-=for apidoc AmU|Perl_check_t *|PL_check
+=for apidoc AmnU|Perl_check_t *|PL_check
 
 Array, indexed by opcode, of functions that will be called for the "check"
 phase of optree building during compilation of Perl code.  For most (but
@@ -178,7 +181,7 @@ PERLVARI(G, my_cxt_index, int,	0)
 PERLVARI(G, veto_cleanup, int, FALSE)	/* exit without cleanup */
 
 /*
-=for apidoc AmUx|Perl_keyword_plugin_t|PL_keyword_plugin
+=for apidoc AmnUx|Perl_keyword_plugin_t|PL_keyword_plugin
 
 Function pointer, pointing at a function used to handle extended keywords.
 The function should be declared as
@@ -279,7 +282,6 @@ PERLVAR(G, HasMultiCharFold,   SV *)
 PERLVAR(G, InMultiCharFold,   SV *)
 PERLVAR(G, Latin1,	SV *)
 PERLVAR(G, LB_invlist, SV *)
-PERLVAR(G, NonFinalFold,   SV *)
 PERLVAR(G, SB_invlist, SV *)
 PERLVAR(G, SCX_invlist, SV *)
 PERLVAR(G, UpperLatin1,	SV *)   /* Code points 128 - 255 */
@@ -304,8 +306,9 @@ PERLVAR(G, utf8_tosimplefold,	SV *)
 PERLVAR(G, utf8_charname_begin, SV *)
 PERLVAR(G, utf8_charname_continue, SV *)
 PERLVAR(G, utf8_mark,	SV *)
-PERLVAR(G, InBitmap,	SV *)
+PERLVARI(G, InBitmap,	SV *, NULL)
 PERLVAR(G, CCC_non0_non230,	SV *)
+PERLVAR(G, Private_Use,	SV *)
 
 /* Definitions of user-defined \p{} properties, as the subs that define them
  * are only called once */
@@ -337,3 +340,13 @@ PERLVARI(G, strategy_socket,     int, 0)	/* doio.c */
 PERLVARI(G, strategy_accept,     int, 0)	/* doio.c */
 PERLVARI(G, strategy_pipe,       int, 0)	/* doio.c */
 PERLVARI(G, strategy_socketpair, int, 0)	/* doio.c */
+
+#ifdef PERL_IMPLICIT_CONTEXT
+#  ifdef PERL_GLOBAL_STRUCT_PRIVATE
+/* per-module array of pointers to MY_CXT_KEY constants.
+ * It simulates each module having a static my_cxt_index var on builds
+ * which don't allow static vars */
+PERLVARI(G, my_cxt_keys, const char **, NULL)
+PERLVARI(G, my_cxt_keys_size, int,	0)	/* size of PL_my_cxt_keys */
+#  endif
+#endif