Fix breakages caused by #31130:

report_uninit was not exported on Win32 and
my_reg_numbered_buff_length had wrong prototype

p4raw-id: //depot/perl@31132

diff --git a/embed.fnc b/embed.fnc
index 3257dd7..addde2c 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -963,7 +963,7 @@ p   |U32    |parse_unicode_opts|NN const char **popt
 Ap     |U32    |seed
 pR     |UV     |get_hash_seed
 p      |void   |report_evil_fh |NULLOK const GV *gv|NULLOK const IO *io|I32 op
-pd     |void   |report_uninit  |NULLOK SV* uninit_sv
+XEpd   |void   |report_uninit  |NULLOK SV* uninit_sv
 Afpd   |void   |warn           |NN const char* pat|...
 Ap     |void   |vwarn          |NN const char* pat|NULLOK va_list* args
 Afp    |void   |warner         |U32 err|NN const char* pat|...

diff --git a/embed.h b/embed.h
index bdf361a..b3e2338 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -986,6 +986,8 @@
 #ifdef PERL_CORE
 #define get_hash_seed          Perl_get_hash_seed
 #define report_evil_fh         Perl_report_evil_fh
+#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define report_uninit          Perl_report_uninit
 #endif
 #define warn                   Perl_warn
@@ -3256,6 +3258,8 @@
 #ifdef PERL_CORE
 #define get_hash_seed()                Perl_get_hash_seed(aTHX)
 #define report_evil_fh(a,b,c)  Perl_report_evil_fh(aTHX_ a,b,c)
+#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define report_uninit(a)       Perl_report_uninit(aTHX_ a)
 #endif
 #define vwarn(a,b)             Perl_vwarn(aTHX_ a,b)

diff --git a/ext/re/re.xs b/ext/re/re.xs
index c569ad1..1344065 100644 (file)
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -23,14 +23,15 @@ extern SV*  my_re_intuit_string (pTHX_ REGEXP * const prog);
 
 extern void    my_regfree (pTHX_ REGEXP * const r);
 
-extern void my_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren,
-                                     SV * const usesv);
-extern void my_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren,
-                                       SV const * const value);
-extern I32 my_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const I32 paren);
-
-extern SV* my_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const key,
-                                      const U32 flags);
+extern void    my_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren,
+                                          SV * const usesv);
+extern void    my_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren,
+                                          SV const * const value);
+extern I32     my_reg_numbered_buff_length(pTHX_ REGEXP * const rx,
+                                           const SV * const sv, const I32 paren);
+
+extern SV*     my_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const key,
+                                       const U32 flags);
 
 extern SV*      my_reg_qr_package(pTHX_ REGEXP * const rx);
 #if defined(USE_ITHREADS)

diff --git a/global.sym b/global.sym
index 59f2452..c5181b4 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -593,6 +593,7 @@ Perl_pv_uni_display
 Perl_sv_uni_display
 Perl_vivify_defelem
 Perl_seed
+Perl_report_uninit
 Perl_warn
 Perl_vwarn
 Perl_warner

diff --git a/proto.h b/proto.h
index fbdf6c8..e731d5f 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1893,7 +1893,7 @@ PERL_CALLCONV regnode*    Perl_regnext(pTHX_ regnode* p)
                        __attribute__nonnull__(pTHX_1);
 
 
-PERL_CALLCONV SV*      Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32 flags)
+PERL_CALLCONV SV*      Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);