diff options
| author | Gurusamy Sarathy <gsar@engin.umich.edu> | 1997-04-23 00:00:00 +0000 |
|---|---|---|
| committer | Chip Salzenberg <chip@atlantic.net> | 1997-04-23 00:00:00 +1200 |
| commit | 10dd38fc8440f4e4fcf5c186239fc21ecb05d6cb (patch) | |
| tree | cad206d12bd750a8551caec94456ed764daefc9b | |
| parent | 34cda023447cc35a1b9e90871460e035dddae4de (diff) | |
| download | perl-10dd38fc8440f4e4fcf5c186239fc21ecb05d6cb.tar.gz | |
Win32 update (two patches)
| -rw-r--r-- | lib/AutoSplit.pm | 2 | ||||
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 6 | ||||
| -rw-r--r-- | win32/config.w32 | 2 | ||||
| -rw-r--r-- | win32/makedef.pl | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/lib/AutoSplit.pm b/lib/AutoSplit.pm index 03d76e66c3..2fd0cac32d 100644 --- a/lib/AutoSplit.pm +++ b/lib/AutoSplit.pm @@ -198,7 +198,7 @@ sub autosplit_file{ die "Package $package ($modpname.pm) does not match filename $filename" unless ($filename =~ m/\Q$modpname.pm\E$/ or - ($^O eq "msdos") or + ($^O eq "msdos") or ($^O eq 'MSWin32') or $Is_VMS && $filename =~ m/$modpname.pm/i); my($al_idx_file) = "$autodir/$modpname/$IndexFile"; diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 33c04df654..b051617c38 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -2895,7 +2895,8 @@ Helper method to write the test targets sub test_via_harness { my($self, $perl, $tests) = @_; - "\tPERL_DL_NONLAZY=1 $perl".q! -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e 'use Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;' !."$tests\n"; + $perl = "PERL_DL_NONLAZY=1 $perl" unless $Is_Win32; + "\t$perl".q! -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e 'use Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;' !."$tests\n"; } =item test_via_script (o) @@ -2906,7 +2907,8 @@ Other helper method for test. sub test_via_script { my($self, $perl, $script) = @_; - qq{\tPERL_DL_NONLAZY=1 $perl}.q{ -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) }.qq{$script + $perl = "PERL_DL_NONLAZY=1 $perl" unless $Is_Win32; + qq{\t$perl}.q{ -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) }.qq{$script }; } diff --git a/win32/config.w32 b/win32/config.w32 index 95697fca50..c8f3fc4eca 100644 --- a/win32/config.w32 +++ b/win32/config.w32 @@ -83,7 +83,7 @@ cryptlib='' csh='undef' d_Gconvert='sprintf((b),"%.*g",(n),(x))' d_access='define' -d_alarm='define' +d_alarm='undef' d_archlib='define' d_attribut='undef' d_bcmp='undef' diff --git a/win32/makedef.pl b/win32/makedef.pl index 5237676b6c..f080dcdb96 100644 --- a/win32/makedef.pl +++ b/win32/makedef.pl @@ -207,7 +207,9 @@ perl_call_argv perl_call_pv perl_call_method perl_call_sv -perl_requirepv +perl_require_pv +perl_eval_pv +perl_eval_sv win32_errno win32_environ win32_stdin |