diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-11 10:31:43 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-11 10:31:43 +0000 |
| commit | a645f979f5f49dd85168fd8c80ded24e8cdff359 (patch) | |
| tree | 43b04dee12067b90695d61aea17115953eb5b15b /lang/perl5.18/files | |
| parent | Upgrade to version 17.5.1. (diff) | |
Patch Perl's header for c++11 compatibility.
While there, drop MASTER_SITE_SUBDIRS.
PR: 199361
Submitted by: amdmi3
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=383784
Diffstat (limited to 'lang/perl5.18/files')
| -rw-r--r-- | lang/perl5.18/files/patch-pad.h | 46 | ||||
| -rw-r--r-- | lang/perl5.18/files/patch-perl.h | 20 |
2 files changed, 66 insertions, 0 deletions
diff --git a/lang/perl5.18/files/patch-pad.h b/lang/perl5.18/files/patch-pad.h new file mode 100644 index 000000000000..df96aad37e16 --- /dev/null +++ b/lang/perl5.18/files/patch-pad.h @@ -0,0 +1,46 @@ +--- pad.h.orig 2014-10-01 01:33:00 UTC ++++ pad.h +@@ -143,14 +143,14 @@ typedef enum { + # define ASSERT_CURPAD_LEGAL(label) \ + pad_peg(label); \ + if (PL_comppad ? (AvARRAY(PL_comppad) != PL_curpad) : (PL_curpad != 0)) \ +- Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + + + # define ASSERT_CURPAD_ACTIVE(label) \ + pad_peg(label); \ + if (!PL_comppad || (AvARRAY(PL_comppad) != PL_curpad)) \ +- Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + #else + # define ASSERT_CURPAD_LEGAL(label) +@@ -320,7 +320,7 @@ Restore the old pad saved into the local + PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ + PL_curpad = AvARRAY(PL_comppad); \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); + + +@@ -338,7 +338,7 @@ Restore the old pad saved into the local + PL_comppad = (npad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + #define PAD_RESTORE_LOCAL(opad) \ +@@ -346,7 +346,7 @@ Restore the old pad saved into the local + PL_comppad = opad; \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + diff --git a/lang/perl5.18/files/patch-perl.h b/lang/perl5.18/files/patch-perl.h new file mode 100644 index 000000000000..59529b6dc876 --- /dev/null +++ b/lang/perl5.18/files/patch-perl.h @@ -0,0 +1,20 @@ +--- perl.h.orig 2014-10-01 01:33:00 UTC ++++ perl.h +@@ -4254,7 +4254,7 @@ START_EXTERN_C + EXTCONST char PL_warn_uninit[] + INIT("Use of uninitialized value%s%s%s"); + EXTCONST char PL_warn_uninit_sv[] +- INIT("Use of uninitialized value%"SVf"%s%s"); ++ INIT("Use of uninitialized value%" SVf "%s%s"); + EXTCONST char PL_warn_nosemi[] + INIT("Semicolon seems to be missing"); + EXTCONST char PL_warn_reserved[] +@@ -4274,7 +4274,7 @@ EXTCONST char PL_no_usym[] + EXTCONST char PL_no_aelem[] + INIT("Modification of non-creatable array value attempted, subscript %d"); + EXTCONST char PL_no_helem_sv[] +- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); ++ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); + EXTCONST char PL_no_modify[] + INIT("Modification of a read-only value attempted"); + EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] |