From 4ce45bab3f8904c62d5ee1ee90b1045ab66a0797 Mon Sep 17 00:00:00 2001 From: "Jerry D. Hedden" Date: Tue, 20 Mar 2007 06:16:46 -0700 Subject: [PATCH] Cwd doesn't need ppport.h in core From: "Jerry D. Hedden" Message-ID: <196803.14702.qm@web30215.mail.mud.yahoo.com> p4raw-id: //depot/perl@30718 --- ext/Cwd/Cwd.xs | 6 ++++-- ext/Cwd/Makefile.PL | 5 +++++ lib/Cwd.pm | 2 +- mkppport.lst | 1 - 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ext/Cwd/Cwd.xs b/ext/Cwd/Cwd.xs index 039adb9..99d372c 100644 --- a/ext/Cwd/Cwd.xs +++ b/ext/Cwd/Cwd.xs @@ -1,8 +1,10 @@ #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#define NEED_sv_2pv_nolen -#include "ppport.h" +#ifdef USE_PPPORT_H +# define NEED_sv_2pv_nolen +# include "ppport.h" +#endif #ifdef I_UNISTD # include diff --git a/ext/Cwd/Makefile.PL b/ext/Cwd/Makefile.PL index 29b8de5..02e5a3b 100644 --- a/ext/Cwd/Makefile.PL +++ b/ext/Cwd/Makefile.PL @@ -2,4 +2,9 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'Cwd', VERSION_FROM => '../../lib/Cwd.pm', + ( + (grep { $_ eq 'PERL_CORE=1' } @ARGV) + ? () + : ('DEFINE' => '-DUSE_PPPORT_H') + ), ); diff --git a/lib/Cwd.pm b/lib/Cwd.pm index cfc0294..7eb0cf5 100644 --- a/lib/Cwd.pm +++ b/lib/Cwd.pm @@ -171,7 +171,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.24'; +$VERSION = '3.24_01'; @ISA = qw/ Exporter /; @EXPORT = qw(cwd getcwd fastcwd fastgetcwd); diff --git a/mkppport.lst b/mkppport.lst index 8c090d4..0e37e5e 100644 --- a/mkppport.lst +++ b/mkppport.lst @@ -5,6 +5,5 @@ # This file is read by mkppport at build time. # -ext/Cwd ext/Time/HiRes ext/Win32API/File -- 2.7.4