Resolve c++ build fail in core

Upstreamed as CPAN RT#92657

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 5ccf4f3..40bd9e7 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -230,6 +230,8 @@ use File::Glob qw(:case);
                 t/99pod.t
                 ),
         ],
+        # Waiting to be merged upstream; see CPAN RT#92657
+        'CUSTOMIZED'  => ['Zlib.xs'],
     },
 
     'Config::Perl::V' => {

diff --git a/cpan/Compress-Raw-Zlib/Zlib.xs b/cpan/Compress-Raw-Zlib/Zlib.xs
index 4b2573a..e1f2a1f 100644 (file)
--- a/cpan/Compress-Raw-Zlib/Zlib.xs
+++ b/cpan/Compress-Raw-Zlib/Zlib.xs
@@ -1450,7 +1450,7 @@ Perl_sv_dump(output); */
     
         if (RETVAL == Z_NEED_DICT && s->dictionary) {
             STRLEN dlen;
-            const Bytef* b = SvPV(s->dictionary, dlen) ;
+            const Bytef* b = (Bytef*) SvPV(s->dictionary, dlen) ;
             s->dict_adler = s->stream.adler ;
             RETVAL = inflateSetDictionary(&(s->stream), 
                 b, dlen);

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 0cee68c..a477894 100644 (file)
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,3 +1,4 @@
+Compress::Raw::Zlib cpan/Compress-Raw-Zlib/Zlib.xs 6659d36455ef430e06a9e6344d4b68b91e71f9ed
 Config::Perl::V cpan/Config-Perl-V/t/20_plv510.t 7263a40dcbaf1ee447f0209d3bbc029cc747c959
 Config::Perl::V cpan/Config-Perl-V/t/21_plv518.t ec23f4e34fb2f84f63f5588ad4a577530dbef5d2
 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf