diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-04 05:03:00 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-04 05:03:00 +0000 |
| commit | 6b5cb48cda959b50de283dd498edd6abcccb1f81 (patch) | |
| tree | 791be5ea562e84927ca3b9faa6eb1b48a7407d88 | |
| parent | 6a34af384f581a141833588aa304bcb3afcba4ca (diff) | |
| download | perl-6b5cb48cda959b50de283dd498edd6abcccb1f81.tar.gz | |
OS/2 build fixups from Ilya Zakharevich
p4raw-id: //depot/perl@4973
| -rw-r--r-- | ext/Devel/DProf/DProf.xs | 7 | ||||
| -rw-r--r-- | os2/Makefile.SHs | 5 | ||||
| -rwxr-xr-x | t/op/fork.t | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/Devel/DProf/DProf.xs b/ext/Devel/DProf/DProf.xs index d59c9dfe11..6ec0275113 100644 --- a/ext/Devel/DProf/DProf.xs +++ b/ext/Devel/DProf/DProf.xs @@ -143,20 +143,21 @@ dprof_times(pTHX_ struct tms *t) #ifdef OS2 ULONG rc; QWORD cnt; + STRLEN n_a; if (!g_frequ) { if (CheckOSError(DosTmrQueryFreq(&g_frequ))) - croak("DosTmrQueryFreq: %s", SvPV(perl_get_sv("!",TRUE),na)); + croak("DosTmrQueryFreq: %s", SvPV(perl_get_sv("!",TRUE),n_a)); else g_frequ = g_frequ/DPROF_HZ; /* count per tick */ if (CheckOSError(DosTmrQueryTime(&cnt))) croak("DosTmrQueryTime: %s", - SvPV(perl_get_sv("!",TRUE),na)); + SvPV(perl_get_sv("!",TRUE), n_a)); g_start_cnt = toLongLong(cnt); } if (CheckOSError(DosTmrQueryTime(&cnt))) - croak("DosTmrQueryTime: %s", SvPV(perl_get_sv("!",TRUE),na)); + croak("DosTmrQueryTime: %s", SvPV(perl_get_sv("!",TRUE), n_a)); t->tms_stime = 0; return (t->tms_utime = (toLongLong(cnt) - g_start_cnt)/g_frequ); #else /* !OS2 */ diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index 005d7a92b6..3a50dc737c 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -41,7 +41,7 @@ CONFIG_ARGS = $config_args !GROK!THIS! $spitshell >>Makefile <<'!NO!SUBS!' -$(LIBPERL): perl.imp perl_dll perl5.def +$(LIBPERL): perl.imp $(PERL_DLL) perl5.def emximp -o $(LIBPERL) perl.imp $(AOUT_LIBPERL_DLL): perl.imp $(PERL_DLL) perl5.def @@ -96,9 +96,6 @@ perl.linkexp: perl.exports perl.map os2/os2.sym # We link miniperl statically, since .DLL depends on $(DYNALOADER) -opmini$(OBJ_EXT) : op.c - $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c - miniperl.map miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) `echo $(obj)|sed -e 's/\bop\./opmini./g'` $(libs) -Zmap -Zlinker /map/PM:VIO @./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest diff --git a/t/op/fork.t b/t/op/fork.t index f3d74f978f..d82c04ff79 100755 --- a/t/op/fork.t +++ b/t/op/fork.t @@ -24,7 +24,7 @@ print "1..", scalar @prgs, "\n"; $tmpfile = "forktmp000"; 1 while -f ++$tmpfile; -END { unlink $tmpfile if $tmpfile; } +END { close TEST; unlink $tmpfile if $tmpfile; } $CAT = (($^O eq 'MSWin32') ? '.\perl -e "print <>"' : 'cat'); @@ -54,6 +54,8 @@ for (@prgs){ # bison says 'parse error' instead of 'syntax error', # various yaccs may or may not capitalize 'syntax'. $results =~ s/^(syntax|parse) error/syntax error/mig; + $results =~ s/^\n*Process terminated by SIG\w+\n?//mg + if $^O eq 'os2'; my @results = sort split /\n/, $results; if ( "@results" ne "@expected" ) { print STDERR "PROG: $switch\n$prog\n"; |