Cwd doesn't need ppport.h in core

From: "Jerry D. Hedden" <jdhedden@yahoo.com>
Message-ID: <196803.14702.qm@web30215.mail.mud.yahoo.com>

p4raw-id: //depot/perl@30718

diff --git a/ext/Cwd/Cwd.xs b/ext/Cwd/Cwd.xs
index 039adb9..99d372c 100644 (file)
--- 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 <unistd.h>

diff --git a/ext/Cwd/Makefile.PL b/ext/Cwd/Makefile.PL
index 29b8de5..02e5a3b 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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