Change 13958 by jhi@alpha on 2001/12/30 16:33:58
Integrate perlio; win32 kicking.
Affected files ...
.... //depot/perl/embed.h#322 integrate
.... //depot/perl/embed.pl#311 integrate
.... //depot/perl/ext/Devel/PPPort/Makefile.PL#4 integrate
.... //depot/perl/ext/Devel/PPPort/ppport.h.PL#1 branch
.... //depot/perl/ext/Devel/PPPort/t/test.t#2 integrate
.... //depot/perl/ext/Errno/Errno_pm.PL#33 integrate
.... //depot/perl/global.sym#198 integrate
.... //depot/perl/proto.h#363 integrate
Differences ...
==== //depot/perl/embed.h#322 (text+w) ====
==== //depot/perl/embed.pl#311 (xtext) ====
==== //depot/perl/ext/Devel/PPPort/Makefile.PL#4 (text) ====
Index: perl/ext/Devel/PPPort/Makefile.PL
--- perl/ext/Devel/PPPort/Makefile.PL.~1~ Sun Dec 30 09:45:05 2001
+++ perl/ext/Devel/PPPort/Makefile.PL Sun Dec 30 09:45:05 2001
@@ -19,11 +19,11 @@
my $retval = <<"EOM";
-ppport.h: $pmfile
- \$(PERL) "-I\$(PERL_ARCHLIB)" "-I\$(PERL_LIB)" -e "require qq{$pmfile};
package Devel::PPPort ; sub bootstrap {} ; WriteFile(qq{ppport.h})"
+#ppport.h:: ppport.h.PL
+# \$(PERL) "-I\$(PERL_ARCHLIB)" "-I\$(PERL_LIB)" ppport.h.PL > ppport.h
PPPort.xs module2.c module3.c : ppport.h
- \$(TOUCH) \$@
+ -\$(TOUCH) \$@
EOM
==== //depot/perl/ext/Devel/PPPort/t/test.t#2 (text) ====
Index: perl/ext/Devel/PPPort/t/test.t
--- perl/ext/Devel/PPPort/t/test.t.~1~ Sun Dec 30 09:45:05 2001
+++ perl/ext/Devel/PPPort/t/test.t Sun Dec 30 09:45:05 2001
@@ -1,16 +1,13 @@
+BEGIN {
+ chdir 't' if -d 't';
+ @INC = '../lib' if -d '../lib';
+}
use Devel::PPPort;
-
use strict;
print "1..17\n";
-BEGIN {
- chdir 't' if -d 't';
- @INC = '../lib' if -d '../lib';
-
-}
-
my $total = 0;
my $good = 0;
==== //depot/perl/ext/Errno/Errno_pm.PL#33 (text) ====
Index: perl/ext/Errno/Errno_pm.PL
--- perl/ext/Errno/Errno_pm.PL.~1~ Sun Dec 30 09:45:05 2001
+++ perl/ext/Errno/Errno_pm.PL Sun Dec 30 09:45:05 2001
@@ -5,6 +5,7 @@
our $VERSION = "1.09_00";
my %err = ();
+my %wsa = ();
unlink "Errno.pm" if -f "Errno.pm";
open OUT, ">Errno.pm" or die "Cannot open Errno.pm: $!";
@@ -12,6 +13,10 @@
my $file;
foreach $file (get_files()) {
process_file($file);
+ if ($^O eq 'MSWin32') {
+ $file =~ s/errno/winsock/;
+ process_file($file);
+ }
}
write_errno_pm();
unlink "errno.c" if -f "errno.c";
@@ -20,6 +25,7 @@
my($file) = @_;
return unless defined $file and -f $file;
+# warn "Processing $file\n";
local *FH;
if (($^O eq 'VMS') && ($Config{vms_cc_type} ne 'gnuc')) {
@@ -55,6 +61,10 @@
while(<FH>) {
$err{$1} = 1
if /^\s*#\s*define\s+(E\w+)\s+/;
+ if ($^O eq 'MSWin32') {
+ $wsa{$1} = 1
+ if /^\s*#\s*define\s+WSA(E\w+)\s+/;
+ }
}
}
close(FH);
@@ -172,11 +182,21 @@
die "Cannot open errno.c";
if ($^O eq 'NetWare') {
- print CPPI "#include <nwerrno.h>\n";
- } else {
- print CPPI "#include <errno.h>\n";
+ print CPPI "#include <nwerrno.h>\n";
+ }
+ else {
+ print CPPI "#include <errno.h>\n";
+ }
+ if ($^O eq 'MSWin32') {
+ print CPPI "#include <winsock.h>\n";
+ foreach $err (keys %wsa) {
+ print CPPI "#ifndef $err\n";
+ print CPPI "#define $err WSA$err\n";
+ print CPPI "#endif\n";
+ $err{$err} = 1;
}
-
+ }
+
foreach $err (keys %err) {
print CPPI '"',$err,'" [[',$err,']]',"\n";
}
==== //depot/perl/global.sym#198 (text+w) ====
==== //depot/perl/proto.h#363 (text+w) ====
==== //depot/perl/ext/Devel/PPPort/ppport.h.PL#1 (text) ====
Index: perl/ext/Devel/PPPort/ppport.h.PL
--- perl/ext/Devel/PPPort/ppport.h.PL.~1~ Sun Dec 30 09:45:05 2001
+++ perl/ext/Devel/PPPort/ppport.h.PL Sun Dec 30 09:45:05 2001
@@ -0,0 +1,5 @@
+my $pmfile = 'PPPort.pm';
+package Devel::PPPort;
+sub bootstrap {};
+require qq[$pmfile];
+WriteFile(qq[ppport.h]);
End of Patch.
