diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 19:27:48 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 19:27:48 +0000 |
| commit | 4755096ec61711c5104ba0b6b9314f32ca0351fe (patch) | |
| tree | 82996f8fa5485964bdfb76e935857ea9bf4165ea /win32 | |
| parent | f05cb5f197f40c7c89d7ac1b0d1fd2e1ac165afe (diff) | |
| download | perl-4755096ec61711c5104ba0b6b9314f32ca0351fe.tar.gz | |
integrate cfgperl changes#6293..6324 into mainline
p4raw-link: @6324 on //depot/cfgperl: 81bf48a6dbba4b295dfa172a17ca70b654dbf225
p4raw-link: @6293 on //depot/cfgperl: 6e37ea6052902cde1aeb08a2129ffc7c8ea53736
p4raw-id: //depot/perl@6369
p4raw-branched: from //depot/cfgperl@6368 'branch in' lib/Win32.pod
lib/lib_pm.PL
p4raw-deleted: from //depot/cfgperl@6368 'delete in' pod/Win32.pod
(@5937..) pod/buildtoc (@6091..) lib/lib.pm.PL (@6227..)
pod/Makefile (@6232..)
p4raw-integrated: from //depot/cfgperl@6368 'copy in' thread.h
(@5656..) lib/warnings/register.pm (@5704..) ext/B/B/Stash.pm
(@5972..) lib/CGI/Util.pm (@6034..) util.c (@6217..) gv.c
(@6244..) pp.c (@6260..) doop.c (@6269..) pod/perlfunc.pod
(@6277..) pp_ctl.c (@6293..) makedef.pl (@6301..) embed.h
global.sym objXSUB.h perlapi.c proto.h (@6305..) win32/Makefile
(@6307..) Makefile.SH (@6309..) t/op/method.t (@6312..) sv.h
(@6315..) 'ignore' op.c (@6273..) 'merge in' embed.pl
win32/win32.c (@6305..)
p4raw-integrated: from //depot/cfgperl@6324 'merge in' toke.c (@6307..)
p4raw-branched: from //depot/cfgperl@6323 'branch in' pod/buildtoc.PL
(@6319..)
p4raw-integrated: from //depot/cfgperl@6323 'copy in' pod/perl.pod
(@6319..) pod/perltoc.pod (@6322..) 'merge in' MANIFEST
(@6319..)
p4raw-branched: from //depot/cfgperl@6319 'branch in' pod/Makefile.SH
p4raw-integrated: from //depot/cfgperl@6315 'ignore' pp_hot.c (@6313..)
p4raw-integrated: from //depot/cfgperl@6311 'copy in'
ext/POSIX/POSIX.pod (@6296..)
p4raw-integrated: from //depot/cfgperl@6307 'merge in' doio.c (@6223..)
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/win32.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile index d669516974..f5ee4c6482 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -972,6 +972,8 @@ utils: $(PERLEXE) $(X2P) copy ..\vms\perlvms.pod .\perlvms.pod copy ..\README.win32 .\perlwin32.pod $(MAKE) -f ..\win32\pod.mak converters + cd ..\lib + $(PERLEXE) lib.pm.PL cd ..\win32 $(PERLEXE) $(PL2BAT) $(UTILS) diff --git a/win32/win32.c b/win32/win32.c index 6e336169bc..60777fa36f 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2393,9 +2393,9 @@ win32_popen(const char *command, const char *mode) /* close saved handle */ win32_close(oldfd); - MUTEX_LOCK(&PL_fdpid_mutex); + LOCK_FDPID_MUTEX; sv_setiv(*av_fetch(w32_fdpid, p[parent], TRUE), childpid); - MUTEX_UNLOCK(&PL_fdpid_mutex); + UNLOCK_FDPID_MUTEX; /* set process id so that it can be returned by perl's open() */ PL_forkprocess = childpid; @@ -2431,9 +2431,9 @@ win32_pclose(FILE *pf) int childpid, status; SV *sv; - MUTEX_LOCK(&PL_fdpid_mutex); + LOCK_FDPID_MUTEX; sv = *av_fetch(w32_fdpid, win32_fileno(pf), TRUE); - MUTEX_UNLOCK(&PL_fdpid_mutex); + if (SvIOK(sv)) childpid = SvIVX(sv); else @@ -2446,6 +2446,7 @@ win32_pclose(FILE *pf) win32_fclose(pf); SvIVX(sv) = 0; + UNLOCK_FDPID_MUTEX; if (win32_waitpid(childpid, &status, 0) == -1) return -1; |