Skip to content

Commit 3b6c1c9

Browse files
Leontdemerphq
authored andcommitted
Use ppport.h when building dist/ modules in core
By always including `ppport.h`, this simplifies both XS code and tooling around it.
1 parent d6959f5 commit 3b6c1c9

File tree

18 files changed

+37
-59
lines changed

18 files changed

+37
-59
lines changed

MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,6 +4107,7 @@ dist/threads/t/stress_string.t Test with multiple threads, string cv argument.
41074107
dist/threads/t/thread.t General ithread tests from thr5005
41084108
dist/threads/t/unique.t Test unique attribute with threads
41094109
dist/threads/t/version.t Test that pod version matches code version.
4110+
dist/threads/threads.h threads compatibility helper
41104111
dist/threads/threads.xs ithreads
41114112
dist/threads-shared/hints/linux.pl thread shared variables
41124113
dist/threads-shared/lib/threads/shared.pm thread shared variables

Porting/Maintainers.pl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,6 @@ package Maintainers;
11831183
qr{^examples/},
11841184
qw( t/pod.t
11851185
t/test.pl
1186-
threads.h
11871186
),
11881187
],
11891188
},
@@ -1193,7 +1192,6 @@ package Maintainers;
11931192
'FILES' => q[dist/threads-shared],
11941193
'EXCLUDED' => [
11951194
qw( examples/class.pl
1196-
shared.h
11971195
t/pod.t
11981196
t/test.pl
11991197
),

dist/Data-Dumper/Dumper.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ our ( $Indent, $Trailingcomma, $Purity, $Pad, $Varname, $Useqq, $Terse, $Freezer
3030
our ( @ISA, @EXPORT, @EXPORT_OK, $VERSION );
3131

3232
BEGIN {
33-
$VERSION = '2.187'; # Don't forget to set version in POD below!
33+
$VERSION = '2.188'; # Don't forget to set version and release
34+
# date in POD below!
3435

3536
@ISA = qw(Exporter);
3637
@EXPORT = qw(Dumper);
@@ -1454,7 +1455,7 @@ modify it under the same terms as Perl itself.
14541455
14551456
=head1 VERSION
14561457
1457-
Version 2.187
1458+
Version 2.188
14581459
14591460
=head1 SEE ALSO
14601461

dist/Data-Dumper/Dumper.xs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
#include "EXTERN.h"
33
#include "perl.h"
44
#include "XSUB.h"
5-
#ifdef USE_PPPORT_H
6-
# define NEED_my_snprintf
7-
# define NEED_my_sprintf
8-
# define NEED_sv_2pv_flags
9-
# define NEED_utf8_to_uvchr_buf
10-
# include "ppport.h"
11-
#endif
5+
#define NEED_my_snprintf
6+
#define NEED_my_sprintf
7+
#define NEED_sv_2pv_flags
8+
#define NEED_utf8_to_uvchr_buf
9+
#include "ppport.h"
1210

1311
#ifndef strlcpy
1412
# ifdef my_strlcpy

dist/Data-Dumper/Makefile.PL

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ WriteMakefile(
1818
VERSION_FROM => 'Dumper.pm',
1919
ABSTRACT_FROM => 'Dumper.pm',
2020
$] <= 5.011000 ? ( INSTALLDIRS => 'perl' ) : (),
21-
((grep { $_ eq 'PERL_CORE=1' } @ARGV) ? () : ('DEFINE' => '-DUSE_PPPORT_H')),
2221
@extra,
2322
);

dist/PathTools/Cwd.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use strict;
33
use Exporter;
44

55

6-
our $VERSION = '3.88';
6+
our $VERSION = '3.89';
77
my $xs_version = $VERSION;
88
$VERSION =~ tr/_//d;
99

dist/PathTools/Cwd.xs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
#include "EXTERN.h"
88
#include "perl.h"
99
#include "XSUB.h"
10-
#ifndef NO_PPPORT_H
11-
# define NEED_croak_xs_usage
12-
# define NEED_sv_2pv_flags
13-
# define NEED_my_strlcpy
14-
# define NEED_my_strlcat
15-
# include "ppport.h"
16-
#endif
10+
#define NEED_croak_xs_usage
11+
#define NEED_sv_2pv_flags
12+
#define NEED_my_strlcpy
13+
#define NEED_my_strlcat
14+
#include "ppport.h"
1715

1816
#if defined(HAS_READLINK) && !defined(PerlLIO_readlink)
1917
#define PerlLIO_readlink readlink

dist/PathTools/Makefile.PL

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ WriteMakefile
2929
'VERSION_FROM' => 'Cwd.pm',
3030
'ABSTRACT' => 'Tools for working with directory and file names',
3131
'AUTHOR' => 'Perl 5 Porters',
32-
'DEFINE' => join(" ",
33-
"-DDOUBLE_SLASHES_SPECIAL=@{[$^O eq q(qnx) || $^O eq q(nto) ? 1 : 0]}",
34-
((grep { $_ eq 'PERL_CORE=1' } @ARGV) ? '-DNO_PPPORT_H' : ()),
35-
),
32+
'DEFINE' => "-DDOUBLE_SLASHES_SPECIAL=@{[$^O eq q(qnx) || $^O eq q(nto) ? 1 : 0]}",
3633
'PREREQ_PM' => {
3734
'Carp' => '0',
3835
'File::Basename' => '0',

dist/Storable/Makefile.PL

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ use warnings;
1111
use ExtUtils::MakeMaker 6.31;
1212
use Config;
1313

14-
my $defines = $ENV{PERL_CORE} ? q[] : q[-DUSE_PPPORT_H];
15-
1614
WriteMakefile(
1715
NAME => 'Storable',
1816
AUTHOR => 'Perl 5 Porters',
1917
LICENSE => 'perl',
2018
DISTNAME => "Storable",
21-
DEFINE => $defines,
2219
PREREQ_PM =>
2320
{
2421
XSLoader => 0,

dist/Storable/Storable.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ our @EXPORT_OK = qw(
2828
our ($canonical, $forgive_me);
2929

3030
BEGIN {
31-
our $VERSION = '3.29';
31+
our $VERSION = '3.30';
3232
}
3333

3434
our $recursion_limit;

0 commit comments

Comments
 (0)